Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
f91e88ec
Verified
Commit
f91e88ec
authored
4 years ago
by
Tom Teichler
Browse files
Options
Downloads
Patches
Plain Diff
Fix permissions
parent
4f2ba34a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!270
Resolve "Frontend for group types"
Pipeline
#2168
passed
4 years ago
Stage: test
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/core/rules.py
+12
-5
12 additions, 5 deletions
aleksis/core/rules.py
aleksis/core/views.py
+2
-2
2 additions, 2 deletions
aleksis/core/views.py
with
14 additions
and
7 deletions
aleksis/core/rules.py
+
12
−
5
View file @
f91e88ec
...
...
@@ -196,16 +196,23 @@ change_group_preferences = has_person & (
add_perm
(
"
core.change_group_preferences
"
,
change_group_preferences
)
# Edit group type
edit
_group_type_predicate
=
has_person
&
(
has_global_perm
(
"
core.change_group
_
type
"
)
|
has_object_perm
(
"
core.change_group
_
type
"
)
change
_group_type_predicate
=
has_person
&
(
has_global_perm
(
"
core.change_grouptype
"
)
|
has_object_perm
(
"
core.change_grouptype
"
)
)
add_perm
(
"
core.edit_group_type
"
,
edit_group_type_predicate
)
add_perm
(
"
core.edit_grouptype
"
,
change_group_type_predicate
)
# Create group type
create_group_type_predicate
=
has_person
&
(
has_global_perm
(
"
core.create_grouptype
"
)
|
has_object_perm
(
"
core.change_grouptype
"
)
)
add_perm
(
"
core.create_grouptype
"
,
create_group_type_predicate
)
# Delete group type
delete_group_type_predicate
=
has_person
&
(
has_global_perm
(
"
core.delete_group
_
type
"
)
|
has_object_perm
(
"
core.delete_group
_
type
"
)
has_global_perm
(
"
core.delete_grouptype
"
)
|
has_object_perm
(
"
core.delete_grouptype
"
)
)
add_perm
(
"
core.delete_group
_
type
"
,
delete_group_type_predicate
)
add_perm
(
"
core.delete_grouptype
"
,
delete_group_type_predicate
)
# View group types
view_group_type_predicate
=
has_person
&
(
...
...
This diff is collapsed.
Click to expand it.
aleksis/core/views.py
+
2
−
2
View file @
f91e88ec
...
...
@@ -447,7 +447,7 @@ def preferences(
return
render
(
request
,
"
dynamic_preferences/form.html
"
,
context
)
@permission_required
(
"
core.
edit
_group
_
type
"
,
fn
=
objectgetter_optional
(
GroupType
,
None
,
False
))
@permission_required
(
"
core.
change
_grouptype
"
,
fn
=
objectgetter_optional
(
GroupType
,
None
,
False
))
def
edit_group_type
(
request
:
HttpRequest
,
id_
:
Optional
[
int
]
=
None
)
->
HttpResponse
:
"""
View to edit or create a group_type.
"""
context
=
{}
...
...
@@ -491,7 +491,7 @@ def group_types(request: HttpRequest) -> HttpResponse:
return
render
(
request
,
"
core/group_types.html
"
,
context
)
@permission_required
(
"
core.delete_group
_
type
"
,
fn
=
objectgetter_optional
(
GroupType
,
None
,
False
))
@permission_required
(
"
core.delete_grouptype
"
,
fn
=
objectgetter_optional
(
GroupType
,
None
,
False
))
def
delete_group_type
(
request
:
HttpRequest
,
id_
:
int
)
->
HttpResponse
:
"""
View to delete an group_type.
"""
group_type
=
objectgetter_optional
(
GroupType
,
None
,
False
)(
request
,
id_
)
...
...
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