diff --git a/server.py b/server.py index aab9476a6621965a3b7a1b6f694188ba4306f3ef..b75ec3f8ae61a404909b7a9feae51cd61b478206 100755 --- a/server.py +++ b/server.py @@ -279,7 +279,7 @@ def edit_reminder(meetingreminder): form.populate_obj(meetingreminder) db.session.commit() return redirect(request.args.get("next") or url_for("show_type", protocoltype_id=protocoltype.id)) - return render_template("reminder-edit.html", form=form, protocoltype=protocoltype, meetingreminder=meetingreminder) + return render_template("reminder-edit.html", form=form, meetingreminder=meetingreminder) @app.route("/type/reminder/delete/<int:meetingreminder_id>") @login_required diff --git a/templates/defaultmeta-edit.html b/templates/defaultmeta-edit.html index 52cc5131ee38c6e3cff15c7df88ba17b4e4aea5f..daff172a60a7d8a3a9cfcf3cb6d4925de4fedda9 100644 --- a/templates/defaultmeta-edit.html +++ b/templates/defaultmeta-edit.html @@ -4,6 +4,6 @@ {% block content %} <div class="container"> - {{render_form(form, action_url=url_for("edit_defaultmeta", defaultmeta_id=meta.id, next=url_for("show_type", protocoltype_id=meta.protocoltype.id)), action_text="Ändern")}} + {{render_form(form, action_url=url_for("edit_defaultmeta", defaultmeta_id=defaultmeta.id, next=url_for("show_type", protocoltype_id=defaultmeta.protocoltype.id)), action_text="Ändern")}} </div> {% endblock %} diff --git a/templates/reminder-edit.html b/templates/reminder-edit.html index 46913fd0719d766157d4efcce6f4192eb58c17da..54d92f77cb2ba5a53096fbbf2ba605b1772859dc 100644 --- a/templates/reminder-edit.html +++ b/templates/reminder-edit.html @@ -4,6 +4,6 @@ {% block content %} <div class="container"> - {{render_form(form, action_url=url_for("edit_reminder", meetingreminder_id=meetingreminder.id, next=url_for("show_type", protocoltype_id=protocoltype.id)), action_text="Ändern")}} + {{render_form(form, action_url=url_for("edit_reminder", meetingreminder_id=meetingreminder.id, next=url_for("show_type", protocoltype_id=meetingreminder.protocoltype.id)), action_text="Ändern")}} </div> {% endblock %} diff --git a/views/forms.py b/views/forms.py index 4f57cc266202cb4f32be297b44944369520538f3..c7a48d55cd9056e061dc37f81f1cd0c23e91d6bb 100644 --- a/views/forms.py +++ b/views/forms.py @@ -134,7 +134,7 @@ class MeetingReminderForm(FlaskForm): class NewProtocolForm(FlaskForm): protocoltype_id = SelectField("Typ", choices=[], coerce=int) - date = DateField("Datum", validators=[InputRequired("Du musst ein Datum angeben.")], format="%d.%m.%Y") + date = DateField("Datum (dd.mm.yyyy)", validators=[InputRequired("Du musst ein Datum angeben.")], format="%d.%m.%Y") def __init__(self, protocoltypes, **kwargs): super().__init__(**kwargs) @@ -165,7 +165,7 @@ class NewProtocolFileUploadForm(FlaskForm): self.protocoltype_id.choices = get_protocoltype_choices(protocoltypes, add_all=False) class ProtocolForm(FlaskForm): - date = DateField("Datum", validators=[InputRequired("Bitte gib das Datum des Protkolls an.")], format="%d.%m.%Y") + date = DateField("Datum (dd.mm.yyyy)", validators=[InputRequired("Bitte gib das Datum des Protkolls an.")], format="%d.%m.%Y") start_time = DateTimeField("Beginn", format="%H:%M", validators=[Optional()]) end_time = DateTimeField("Ende", format="%H:%M", validators=[Optional()]) location = StringField("Ort") @@ -192,7 +192,7 @@ class NewTodoForm(FlaskForm): who = StringField("Person", validators=[InputRequired("Bitte gib an, wer das Todo erledigen soll.")]) description = StringField("Aufgabe", validators=[InputRequired("Bitte gib an, was erledigt werden soll.")]) state = SelectField("Status", choices=[], coerce=coerce_todostate, validators=[CheckTodoDateByState()]) - date = DateField("Datum", format="%d.%m.%Y", validators=[Optional()]) + date = DateField("Datum (dd.mm.yyyy)", format="%d.%m.%Y", validators=[Optional()]) def __init__(self, protocoltypes, **kwargs): super().__init__(**kwargs) @@ -203,7 +203,7 @@ class TodoForm(FlaskForm): who = StringField("Person") description = StringField("Aufgabe", validators=[InputRequired("Bitte gib an, was erledigt werden soll.")]) state = SelectField("Status", choices=[], coerce=coerce_todostate, validators=[CheckTodoDateByState()]) - date = DateField("Datum", format="%d.%m.%Y", validators=[Optional()]) + date = DateField("Datum (dd.mm.yyyy)", format="%d.%m.%Y", validators=[Optional()]) def __init__(self, **kwargs): super().__init__(**kwargs)