From 4d562df0deb99efec8c22c8dc529b5d400c67d03 Mon Sep 17 00:00:00 2001 From: Sindre Stephansen Date: Thu, 12 Mar 2020 16:47:12 +0100 Subject: [PATCH] Minor fixes to code style in project files --- src/app/views/new_project.py | 47 +++++++++++++++++----------------- src/app/views/open_projects.py | 6 ++--- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/app/views/new_project.py b/src/app/views/new_project.py index 06f7f50..e1b32f9 100755 --- a/src/app/views/new_project.py +++ b/src/app/views/new_project.py @@ -8,8 +8,8 @@ import models.user # Get html templates render = web.template.render('templates/') -class New_project: +class New_project: def GET(self): """ Get the project registration form @@ -60,7 +60,6 @@ class New_project: # Post the form data and save the project in the database if data.create_project: - project_form = self.compose_form(data, None) if not project_form.validates(): return render.new_project(nav, project_form, project_buttons, "") @@ -89,28 +88,28 @@ class New_project: # Save the users in the database given that the input field is not empty for i in range(0, user_count): - if len(data["user_name_"+str(i)]): - userid = models.user.get_user_id_by_name(data["user_name_"+str(i)]) - read, write, modify = "FALSE", "FALSE", "FALSE" - try: - data["read_permission_"+str(i)] - read = "TRUE" - except Exception as e: - read = "FALSE" - pass - try: - data["write_permission_"+str(i)] - write = "TRUE" - except Exception as e: - write = "FALSE" - pass - try: - data["modify_permission_"+str(i)] - modify = "TRUE" - except Exception as e: - modify = "FALSE" - pass - models.project.set_projects_user(str(projectid), str(userid), read, write, modify) + if len(data["user_name_"+str(i)]): + userid = models.user.get_user_id_by_name(data["user_name_"+str(i)]) + read, write, modify = "FALSE", "FALSE", "FALSE" + try: + data["read_permission_"+str(i)] + read = "TRUE" + except Exception as e: + read = "FALSE" + pass + try: + data["write_permission_"+str(i)] + write = "TRUE" + except Exception as e: + write = "FALSE" + pass + try: + data["modify_permission_"+str(i)] + modify = "TRUE" + except Exception as e: + modify = "FALSE" + pass + models.project.set_projects_user(str(projectid), str(userid), read, write, modify) raise web.seeother('/?projects=my') def compose_form(self, data, operation): diff --git a/src/app/views/open_projects.py b/src/app/views/open_projects.py index dc427ba..332e3b9 100755 --- a/src/app/views/open_projects.py +++ b/src/app/views/open_projects.py @@ -5,17 +5,17 @@ from models.project import get_categories, get_projects_by_status_and_category # Get html templates render = web.template.render('templates/') + class Open_projects: - def GET(self): """ - Get all open projects + Get all open projects :return: A page containing all open projects """ session = web.ctx.session data = web.input(categoryid=0) - open_projects=[] + open_projects = [] if data.categoryid != 0: open_projects = get_projects_by_status_and_category(data.categoryid, "open") nav = get_nav_bar(session)