浏览代码

bugfix

https
jakobsn 6 年前
父节点
当前提交
e4501c05be
共有 4 个文件被更改,包括 21 次插入6 次删除
  1. +8
    -0
      src/app/static/stylesheet.css
  2. +1
    -1
      src/app/templates/open_projects.html
  3. +7
    -4
      src/app/templates/project.html
  4. +5
    -1
      src/app/views/project.py

+ 8
- 0
src/app/static/stylesheet.css 查看文件

@@ -113,3 +113,11 @@ nav ul {
#project_meta { #project_meta {
margin: auto; margin: auto;
} }

div {
margin: auto;
}

form {
margin: auto;
}

+ 1
- 1
src/app/templates/open_projects.html 查看文件

@@ -17,7 +17,7 @@ $def with (nav, categories, open_projects)
$for category in categories: $for category in categories:
<div class="category" onclick="location.href='/open_projects?categoryid=$category[0]'">$category[1]</div> <div class="category" onclick="location.href='/open_projects?categoryid=$category[0]'">$category[1]</div>
</div> </div>
<div class="projects"> <div class="projects">
$for project in open_projects: $for project in open_projects:
<div class="project" onclick="location.href='/project?projectid=$project[0]'"><h4>$project[3]</h4><p>$project[4]</p></div> <div class="project" onclick="location.href='/project?projectid=$project[0]'"><h4>$project[3]</h4><p>$project[4]</p></div>


+ 7
- 4
src/app/templates/project.html 查看文件

@@ -12,7 +12,7 @@ $def with (nav, project_form, project, tasks, permissions, categories)
$:nav $:nav


$if len(project):
$if len(project) and permissions[0]:
<h1>Project: $project[3]</h1> <h1>Project: $project[3]</h1>


$if project[5] == "open" and session.userid != project[2]: $if project[5] == "open" and session.userid != project[2]:
@@ -38,8 +38,9 @@ $def with (nav, project_form, project, tasks, permissions, categories)
$project_form.taskid.set_value(task[0]) $project_form.taskid.set_value(task[0])
$:project_form.taskid.render() $:project_form.taskid.render()
$if (task[5] == "waiting for delivery" or task[5] == "declined"): $if (task[5] == "waiting for delivery" or task[5] == "declined"):
$:project_form.myfile.render()
$:project_form.submit.render()
$if permissions[1]:
$:project_form.myfile.render()
$:project_form.submit.render()
$if permissions[2]: $if permissions[2]:
$:project_form.deliver.render() $:project_form.deliver.render()
$if session.userid == project[2] and task[5] == "delivered": $if session.userid == project[2] and task[5] == "delivered":
@@ -48,5 +49,7 @@ $def with (nav, project_form, project, tasks, permissions, categories)
</form> </form>
</li> </li>
</ul> </ul>

$else:
<p>You do not have permissions to view this project</p>
</body> </body>

+ 5
- 1
src/app/views/project.py 查看文件

@@ -25,7 +25,11 @@ class Project:


data = web.input(projectid=0) data = web.input(projectid=0)


permissions = models.project.get_user_permissions(str(session.userid), data.projectid)
try:
permissions = models.project.get_user_permissions(str(session.userid), data.projectid)
except:
permissions = [0,0,0]

categories = models.project.get_categories() categories = models.project.get_categories()


if data.projectid: if data.projectid:


正在加载...
取消
保存