From 8c68540bc5d47db7c45f2770cf7ecf2101f76637 Mon Sep 17 00:00:00 2001 From: Jiri Kalvoda <jirikalvoda@kam.mff.cuni.cz> Date: Tue, 12 Oct 2021 18:30:52 +0200 Subject: [PATCH] =?UTF-8?q?BUGFIX=20hled=C3=A1n=C3=AD=20v=20podoblast?= =?UTF-8?q?=C3=AD=20v=20filtru=20organiz=C3=A1tor=C5=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mo/web/org_users.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mo/web/org_users.py b/mo/web/org_users.py index 3ef60af3..bc17c45d 100644 --- a/mo/web/org_users.py +++ b/mo/web/org_users.py @@ -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) -- GitLab