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
cfe24e34
Commit
cfe24e34
authored
4 years ago
by
Jiří Setnička
Browse files
Options
Downloads
Patches
Plain Diff
Názvy rolí přesunuty do mo/db.py
Aby je šlo používat z db package (jinak by byl problém s cyklickou závislostí).
parent
6fbda24a
No related branches found
No related tags found
1 merge request
!6
Práva organizátorů
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
mo/db.py
+22
-0
22 additions, 0 deletions
mo/db.py
mo/rights.py
+5
-5
5 additions, 5 deletions
mo/rights.py
with
27 additions
and
5 deletions
mo/db.py
+
22
−
0
View file @
cfe24e34
...
...
@@ -285,6 +285,14 @@ class RoleType(MOEnum):
opravovatel
=
auto
()
role_type_names
=
{
RoleType
.
garant
:
'
celostátní garant
'
,
RoleType
.
garant_kraj
:
'
krajský garant
'
,
RoleType
.
garant_okres
:
'
okresní garant
'
,
RoleType
.
dozor
:
'
dozor
'
,
RoleType
.
opravovatel
:
'
opravovatel
'
,
}
class
UserRole
(
Base
):
__tablename__
=
'
user_roles
'
...
...
@@ -302,6 +310,20 @@ class UserRole(Base):
assigned_by_user
=
relationship
(
'
User
'
,
primaryjoin
=
'
UserRole.assigned_by == User.user_id
'
)
place
=
relationship
(
'
Place
'
)
def
__str__
(
self
):
parts
=
[
role_type_names
[
self
.
role
]]
if
self
.
seq
:
parts
.
append
(
f
"
{
self
.
seq
}
. kola
"
)
if
self
.
year
:
parts
.
append
(
f
"
{
self
.
year
}
. ročníku
"
)
if
self
.
category
:
parts
.
append
(
f
"
kategorie
{
self
.
category
}
"
)
parts
.
append
(
"
pro
"
)
parts
.
append
(
self
.
place
.
type_name
())
parts
.
append
(
self
.
place
.
name
)
return
"
"
.
join
(
parts
)
class
PaperType
(
MOEnum
):
solution
=
auto
()
...
...
This diff is collapsed.
Click to expand it.
mo/rights.py
+
5
−
5
View file @
cfe24e34
...
...
@@ -32,7 +32,7 @@ class Role:
roles
:
List
[
Role
]
=
[
Role
(
role
=
db
.
RoleType
.
garant
,
name
=
'
celostátní
garant
'
,
name
=
db
.
role_type_names
[
db
.
RoleType
.
garant
]
,
rights
=
{
Right
.
assign_rights
,
Right
.
edit_place
,
...
...
@@ -45,7 +45,7 @@ roles: List[Role] = [
),
Role
(
role
=
db
.
RoleType
.
garant_kraj
,
name
=
'
krajský garant
'
,
name
=
db
.
role_type_names
[
db
.
RoleType
.
garant_kraj
]
,
rights
=
{
Right
.
assign_rights
,
Right
.
edit_place
,
...
...
@@ -58,7 +58,7 @@ roles: List[Role] = [
),
Role
(
role
=
db
.
RoleType
.
garant_okres
,
name
=
'
okresní garant
'
,
name
=
db
.
role_type_names
[
db
.
RoleType
.
garant_okres
]
,
rights
=
{
Right
.
assign_rights
,
Right
.
edit_place
,
...
...
@@ -69,7 +69,7 @@ roles: List[Role] = [
),
Role
(
role
=
db
.
RoleType
.
dozor
,
name
=
'
dozor
'
,
name
=
db
.
role_type_names
[
db
.
RoleType
.
dozor
]
,
rights
=
{
Right
.
upload_solutions
,
Right
.
add_users
,
...
...
@@ -77,7 +77,7 @@ roles: List[Role] = [
),
Role
(
role
=
db
.
RoleType
.
opravovatel
,
name
=
'
opravovatel
'
,
name
=
db
.
role_type_names
[
db
.
RoleType
.
opravovatel
]
,
rights
=
{
Right
.
upload_feedback
,
Right
.
edit_points
,
...
...
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