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
cab8db5c
Commit
cab8db5c
authored
4 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix/order-of-mixins' into 'master'
Fix order of mixins Closes
#309
See merge request
!424
parents
bab6a711
133c1dc5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!424
Fix order of mixins
Pipeline
#5108
passed
4 years ago
Stage: test
Stage: build
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/core/views.py
+7
-7
7 additions, 7 deletions
aleksis/core/views.py
with
7 additions
and
7 deletions
aleksis/core/views.py
+
7
−
7
View file @
cab8db5c
...
...
@@ -114,7 +114,7 @@ def about(request: HttpRequest) -> HttpResponse:
return
render
(
request
,
"
core/pages/about.html
"
,
context
)
class
SchoolTermListView
(
SingleTableView
,
PermissionRequiredMixin
):
class
SchoolTermListView
(
PermissionRequiredMixin
,
SingleTableView
):
"""
Table of all school terms.
"""
model
=
SchoolTerm
...
...
@@ -124,7 +124,7 @@ class SchoolTermListView(SingleTableView, PermissionRequiredMixin):
@method_decorator
(
never_cache
,
name
=
"
dispatch
"
)
class
SchoolTermCreateView
(
AdvancedCreateView
,
PermissionRequiredMixin
):
class
SchoolTermCreateView
(
PermissionRequiredMixin
,
AdvancedCreateView
):
"""
Create view for school terms.
"""
model
=
SchoolTerm
...
...
@@ -136,7 +136,7 @@ class SchoolTermCreateView(AdvancedCreateView, PermissionRequiredMixin):
@method_decorator
(
never_cache
,
name
=
"
dispatch
"
)
class
SchoolTermEditView
(
AdvancedEditView
,
PermissionRequiredMixin
):
class
SchoolTermEditView
(
PermissionRequiredMixin
,
AdvancedEditView
):
"""
Edit view for school terms.
"""
model
=
SchoolTerm
...
...
@@ -382,7 +382,7 @@ def data_management(request: HttpRequest) -> HttpResponse:
return
render
(
request
,
"
core/management/data_management.html
"
,
context
)
class
SystemStatus
(
MainView
,
PermissionRequiredMixin
):
class
SystemStatus
(
PermissionRequiredMixin
,
MainView
):
"""
View giving information about the system status.
"""
template_name
=
"
core/pages/system_status.html
"
...
...
@@ -773,7 +773,7 @@ class SolveDataCheckView(PermissionRequiredMixin, RevisionMixin, DetailView):
return
HttpResponseNotFound
()
class
DashboardWidgetListView
(
SingleTableView
,
PermissionRequiredMixin
):
class
DashboardWidgetListView
(
PermissionRequiredMixin
,
SingleTableView
):
"""
Table of all dashboard widgets.
"""
model
=
DashboardWidget
...
...
@@ -791,7 +791,7 @@ class DashboardWidgetListView(SingleTableView, PermissionRequiredMixin):
@method_decorator
(
never_cache
,
name
=
"
dispatch
"
)
class
DashboardWidgetEditView
(
AdvancedEditView
,
PermissionRequiredMixin
):
class
DashboardWidgetEditView
(
PermissionRequiredMixin
,
AdvancedEditView
):
"""
Edit view for dashboard widgets.
"""
def
get_form_class
(
self
)
->
Type
[
BaseModelForm
]:
...
...
@@ -806,7 +806,7 @@ class DashboardWidgetEditView(AdvancedEditView, PermissionRequiredMixin):
@method_decorator
(
never_cache
,
name
=
"
dispatch
"
)
class
DashboardWidgetCreateView
(
AdvancedCreateView
,
PermissionRequiredMixin
):
class
DashboardWidgetCreateView
(
PermissionRequiredMixin
,
AdvancedCreateView
):
"""
Create view for dashboard widgets.
"""
def
get_model
(
self
,
request
,
*
args
,
**
kwargs
):
...
...
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