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
Commits
15d4acd8
Commit
15d4acd8
authored
4 years ago
by
Jiří Kalvoda
Browse files
Options
Downloads
Patches
Plain Diff
Zvýraznění rolí nalezených pomocí hledání orgů dle rolí
Closes
#225
parent
1b5ce60d
No related branches found
No related tags found
1 merge request
!88
Přdáno filtrování orgů podle rolí
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
mo/web/org_users.py
+15
-2
15 additions, 2 deletions
mo/web/org_users.py
mo/web/templates/org_orgs.html
+5
-1
5 additions, 1 deletion
mo/web/templates/org_orgs.html
with
20 additions
and
3 deletions
mo/web/org_users.py
+
15
−
2
View file @
15d4acd8
...
...
@@ -4,6 +4,7 @@ from flask_wtf import FlaskForm
import
werkzeug.exceptions
import
wtforms
from
sqlalchemy
import
or_
import
flask_sqlalchemy
from
sqlalchemy.orm
import
joinedload
,
subqueryload
from
wtforms
import
validators
...
...
@@ -249,8 +250,7 @@ def org_orgs():
db
.
User
.
last_name
.
ilike
(
filter
.
f_search_name
)
))
if
filter
.
is_role_filter
.
data
:
qr
=
sess
.
query
(
db
.
UserRole
.
user_id
)
def
query_filter_role
(
qr
:
flask_sqlalchemy
.
BaseQuery
)
->
flask_sqlalchemy
.
BaseQuery
:
if
filter
.
f_search_role
is
not
None
:
qr
=
qr
.
filter
(
db
.
UserRole
.
role
.
in_
(
filter
.
f_search_role
))
if
filter
.
f_search_category
is
not
None
:
...
...
@@ -268,6 +268,11 @@ def org_orgs():
qr
=
qr
.
filter
(
db
.
UserRole
.
place_id
.
in_
(
sess
.
query
(
db
.
Place
.
place_id
).
filter
(
db
.
Place
.
level
.
in_
(
filter
.
f_search_place_level
))
))
return
qr
if
filter
.
is_role_filter
.
data
:
qr
=
sess
.
query
(
db
.
UserRole
.
user_id
)
qr
=
query_filter_role
(
qr
)
q
=
q
.
filter
(
db
.
User
.
user_id
.
in_
(
qr
))
q
=
q
.
order_by
(
db
.
User
.
user_id
)
...
...
@@ -275,9 +280,17 @@ def org_orgs():
(
count
,
q
)
=
filter
.
apply_limits
(
q
,
pagesize
=
50
)
users
=
q
.
all
()
marked_roles_id
:
Set
[
int
]
=
set
()
if
filter
.
is_role_filter
.
data
:
qmr
=
sess
.
query
(
db
.
UserRole
.
user_role_id
).
filter
(
db
.
UserRole
.
user_id
.
in_
([
i
.
user_id
for
i
in
users
]))
qmr
=
query_filter_role
(
qmr
)
marked_roles_id
=
set
([
i
[
0
]
for
i
in
qmr
.
all
()])
return
render_template
(
'
org_orgs.html
'
,
users
=
users
,
count
=
count
,
filter
=
filter
,
marked_roles_id
=
marked_roles_id
,
can_edit
=
rr
.
have_right
(
Right
.
edit_orgs
),
can_add
=
rr
.
have_right
(
Right
.
add_orgs
),
)
...
...
This diff is collapsed.
Click to expand it.
mo/web/templates/org_orgs.html
+
5
−
1
View file @
15d4acd8
...
...
@@ -85,7 +85,11 @@
{% if user.roles|count > 0 %}
<ul>
{% for role in user.roles %}
{% if role.user_role_id in marked_roles_id %}
<li><b>
{{ role }}
</b></li>
{% else %}
<li>
{{ role }}
</li>
{% endif %}
{%- endfor %}
</ul>
{% endif %}
</td>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment