Skip to content
Snippets Groups Projects

Dodělávky manipulace s places

Merged Jiří Setnička requested to merge jirka/schools into master
2 unresolved threads
1 file
+ 25
3
Compare changes
  • Side-by-side
  • Inline
+ 25
3
@@ -115,7+115,7 @@
@@ -115,7+115,7 @@
what=school.place_id,
what=school.place_id,
details={'action': 'school-delete', 'school': db.row2dict(school)},
details={'action': 'school-delete', 'school': db.row2dict(school)},
)
)
app.logger.info(f"Deleting school record for place {place.place_id}")
app.logger.info(f"Deleting school record for place {place.place_id}")
db.get_session().delete(school)
db.get_session().delete(school)
msg = 'Změny místa uloženy, záznam o škole smazán'
msg = 'Změny místa uloženy, záznam o škole smazán'
else:
else:
@@ -251,7+251,7 @@
@@ -251,7+251,7 @@
flash("Nelze smazat místo s podřízenými místy", "danger")
flash("Nelze smazat místo s podřízenými místy", "danger")
return redirect(url_for('org_place', id=id))
return redirect(url_for('org_place', id=id))
 
# Cannot delete place with contests
 
if sess.query(db.Contest).filter_by(place_id=id).count() > 0:
 
flash("Nelze smazat místo ke kterému se váže nějaká soutěž ", "danger")
 
return redirect(url_for('org_place', id=id))
 
if place.type == db.PlaceType.school:
if place.type == db.PlaceType.school:
school = sess.query(db.School).get(place.place_id)
school = sess.query(db.School).get(place.place_id)
mo.util.log(
mo.util.log(
@@ -308,10 +313,27 @@ def org_place_new_child(id: int):
@@ -308,10 +313,27 @@ def org_place_new_child(id: int):
what=new_place.place_id,
what=new_place.place_id,
details={'action': 'new', 'place': db.row2dict(new_place)},
details={'action': 'new', 'place': db.row2dict(new_place)},
)
)
db.get_session().commit()
flash(u'Nové místo uloženo', 'success')
return redirect(url_for('org_place', id=new_place.place_id))
redirect_url = url_for('org_place', id=new_place.place_id)
 
msg = 'Nové místo uloženo'
 
 
if new_place.type == db.PlaceType.school:
 
new_school = db.School()
 
new_school.place_id = new_place.place_id
 
mo.util.log(
 
type=db.LogType.place,
 
what=new_school.place_id,
 
details={'action': 'school-add'},
 
)
 
app.logger.info(f"Creating new school for place {new_place.place_id}")
 
sess.add(new_school)
 
# Take org directly to the school edit to fill the data
 
msg = 'Záznam o škole vytvořen, vyplňte prosím všechna data'
 
redirect_url = url_for('org_place_edit', id=new_place.place_id)
 
 
sess.commit()
 
flash(msg, 'success')
 
return redirect(redirect_url)
parents = reversed(db.get_place_parents(parent_place))
parents = reversed(db.get_place_parents(parent_place))
Loading