Skip to content
Snippets Groups Projects
Commit cc06abe8 authored by Jiří Kalvoda's avatar Jiří Kalvoda
Browse files

Fields: PlaceMoveForm

parent 6128e5f5
No related branches found
No related tags found
1 merge request!92Používání mo.web.fields
This commit is part of merge request !92. Comments created here will be created in the context of that merge request.
...@@ -13,6 +13,7 @@ import mo.imports ...@@ -13,6 +13,7 @@ import mo.imports
import mo.rights import mo.rights
import mo.util import mo.util
from mo.web import app from mo.web import app
import mo.web.fields as mo_fields
import wtforms.validators as validators import wtforms.validators as validators
...@@ -177,14 +178,14 @@ def org_place_edit(id: int): ...@@ -177,14 +178,14 @@ def org_place_edit(id: int):
class PlaceMoveForm(FlaskForm): class PlaceMoveForm(FlaskForm):
code = wtforms.StringField(validators=[validators.DataRequired()], render_kw={'autofocus': True}) new_parent = mo_fields.Place(validators=[validators.DataRequired()], render_kw={'autofocus': True})
submit = wtforms.SubmitField('Najít místo') submit = wtforms.SubmitField('Najít místo')
reset = wtforms.HiddenField() reset = wtforms.HiddenField()
move = wtforms.HiddenField() move = wtforms.HiddenField()
class PlaceMoveConfirmForm(FlaskForm): class PlaceMoveConfirmForm(FlaskForm):
code = wtforms.HiddenField() new_parent = mo_fields.Place(widget = wtforms.widgets.HiddenInput())
reset = wtforms.SubmitField('Zrušit') reset = wtforms.SubmitField('Zrušit')
move = wtforms.SubmitField('Přesunout') move = wtforms.SubmitField('Přesunout')
...@@ -206,14 +207,14 @@ def org_place_move(id: int): ...@@ -206,14 +207,14 @@ def org_place_move(id: int):
form = PlaceMoveForm() form = PlaceMoveForm()
form_confirm = None form_confirm = None
if form.validate_on_submit(): if not form.validate_on_submit():
if form.new_parent.place_error:
search_error = form.new_parent.place_error
else:
if form.reset.data: if form.reset.data:
return redirect(url_for('org_place_move', id=id)) return redirect(url_for('org_place_move', id=id))
new_parent = db.get_place_by_code(form.code.data) new_parent = form.new_parent.place
if not new_parent:
search_error = 'Místo s tímto kódem se nepovedlo nalézt'
else:
new_parents = reversed(g.gatekeeper.get_parents(new_parent)) new_parents = reversed(g.gatekeeper.get_parents(new_parent))
(_, levels) = db.place_type_names_and_levels[place.type] (_, levels) = db.place_type_names_and_levels[place.type]
...@@ -241,7 +242,9 @@ def org_place_move(id: int): ...@@ -241,7 +242,9 @@ def org_place_move(id: int):
else: else:
# OK but not confirmed yet, display the confirm form # OK but not confirmed yet, display the confirm form
form_confirm = PlaceMoveConfirmForm() form_confirm = PlaceMoveConfirmForm()
form_confirm.code.data = form.code.data form_confirm.new_parent.data = form.new_parent.data
# tady se používá hnusný trik, že políčko new_parents z PlaceMoveConfirmForm se
# parsuje jako new_parents z PlaceMoveForm
return render_template( return render_template(
'org_place_move.html', 'org_place_move.html',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment