Skip to content
Snippets Groups Projects

Jk/bug filter

Merged Jiří Kalvoda requested to merge jk/bug-filter into master
1 file
+ 2
3
Compare changes
  • Side-by-side
  • Inline
+ 2
3
@@ -3,7 +3,7 @@ from flask import render_template, g, redirect, url_for, flash, request
from flask_wtf import FlaskForm
import werkzeug.exceptions
import wtforms
from sqlalchemy import or_
from sqlalchemy import or_, select
import flask_sqlalchemy
from sqlalchemy.orm import joinedload, subqueryload
@@ -199,7 +199,7 @@ def org_orgs():
qr = qr.filter(or_(db.UserRole.year.in_(filter.search_year.list), db.UserRole.year == None))
pass
if filter.search_in_place.place is not None:
qr = qr.filter(db.UserRole.place_id.in_(db.place_descendant_cte(filter.search_in_place.place)))
qr = qr.filter(db.UserRole.place_id.in_(select([db.place_descendant_cte(filter.search_in_place.place)])))
if filter.search_right_for_place.place is not None:
qr = qr.filter(db.UserRole.place_id.in_([x.place_id for x in db.get_place_ancestors(filter.search_right_for_place.place)]))
# Po n>3 hodinách v mo.db jsem dospěl k závěru, že to hezčeji neumím (neumím vyrobit place_parents_cte)
@@ -207,7 +207,6 @@ def org_orgs():
qr = qr.filter(db.UserRole.place_id.in_(
sess.query(db.Place.place_id).filter(db.Place.level.in_(filter.search_place_level.data))
))
print(qr)
return qr
if filter.is_role_filter.data:
Loading