Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Odevzdávací Systém MO
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martin Mareš
Odevzdávací Systém MO
Merge requests
!101
Jk/bug filter
Code
Review changes
Check out branch
Download
Patches
Plain diff
Expand sidebar
Merged
Jk/bug filter
jk/bug-filter
into
master
Overview
1
Commits
2
Changes
1
Merged
Jiří Kalvoda
requested to merge
jk/bug-filter
into
master
3 years ago
Overview
1
Commits
2
Changes
1
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
1d321b5e
2 commits,
3 years ago
1 file
+
2
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
mo/web/org_users.py
+
2
−
3
View file @ 1d321b5e
Edit in single-file editor
Open in Web IDE
Show full file
@@ -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