From 39b77ec4ebfcf8b4111ccd82e6343718d9ad62d3 Mon Sep 17 00:00:00 2001
From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de>
Date: Wed, 15 Mar 2017 00:49:03 +0100
Subject: [PATCH] Use correct GET-parameter for protocoltypes
/close #54
---
server.py | 8 ++++----
views/forms.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server.py b/server.py
index 45c1696..8a3fdb2 100755
--- a/server.py
+++ b/server.py
@@ -354,7 +354,7 @@ def list_protocols():
protocoltypes = ProtocolType.get_public_protocoltypes(user)
search_form = SearchForm(protocoltypes)
if protocoltype_id is not None:
- search_form.protocoltype.data = protocoltype_id
+ search_form.protocoltype_id.data = protocoltype_id
protocoltype = ProtocolType.query.filter_by(id=protocoltype_id).first()
if search_term is not None:
search_form.search.data = search_term
@@ -769,7 +769,7 @@ def list_todos():
protocoltypes = ProtocolType.get_public_protocoltypes(user)
search_form = SearchForm(protocoltypes)
if protocoltype_id is not None:
- search_form.protocoltype.data = protocoltype_id
+ search_form.protocoltype_id.data = protocoltype_id
protocoltype = ProtocolType.query.filter_by(id=protocoltype_id).first()
if search_term is not None:
search_form.search.data = search_term
@@ -901,14 +901,14 @@ def list_decisions():
protocoltype = None
protocoltype_id = None
try:
- protocoltype_id = int(request.args.get("protocoltype"))
+ protocoltype_id = int(request.args.get("protocoltype_id"))
except (ValueError, TypeError):
pass
search_term = request.args.get("search")
protocoltypes = ProtocolType.get_public_protocoltypes(user)
search_form = SearchForm(protocoltypes)
if protocoltype_id is not None:
- search_form.protocoltype.data = protocoltype_id
+ search_form.protocoltype_id.data = protocoltype_id
protocoltype = ProtocolType.query.filter_by(id=protocoltype_id).first()
if search_term is not None:
search_form.search.data = search_term
diff --git a/views/forms.py b/views/forms.py
index 7f8a96e..cff0937 100644
--- a/views/forms.py
+++ b/views/forms.py
@@ -182,11 +182,11 @@ class TopForm(FlaskForm):
class SearchForm(FlaskForm):
search = StringField("Suchbegriff")
- protocoltype = SelectField("Typ", choices=[], coerce=int)
+ protocoltype_id = SelectField("Typ", choices=[], coerce=int)
def __init__(self, protocoltypes, **kwargs):
super().__init__(**kwargs)
- self.protocoltype.choices = get_protocoltype_choices(protocoltypes)
+ self.protocoltype_id.choices = get_protocoltype_choices(protocoltypes)
class NewTodoForm(FlaskForm):
protocoltype_id = SelectField("Typ", choices=[], coerce=int)
--
GitLab