Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
steering
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AURA
steering
Commits
cf8aad60
Verified
Commit
cf8aad60
authored
11 months ago
by
Ernesto Rico Schmidt
Browse files
Options
Downloads
Patches
Plain Diff
refactor: remove DisabledObjectPermissionCheckMixin since it’s no longer used
parent
0576c47e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
program/utils.py
+0
-19
0 additions, 19 deletions
program/utils.py
program/views.py
+2
-11
2 additions, 11 deletions
program/views.py
with
2 additions
and
30 deletions
program/utils.py
+
0
−
19
View file @
cf8aad60
...
@@ -128,25 +128,6 @@ def delete_links(instance: Union["Host", "Note", "Show"]) -> Union["Host", "Note
...
@@ -128,25 +128,6 @@ def delete_links(instance: Union["Host", "Note", "Show"]) -> Union["Host", "Note
return
instance
return
instance
class
DisabledObjectPermissionCheckMixin
:
"""
At the time of writing permission checks were entirely circumvented by manual
queries in viewsets. To make code refactoring easier and allow
the paced introduction of .get_object() in viewsets, object permission checks
need to be disabled until permission checks have been refactored as well.
Object permissions checks should become mandatory once proper permission_classes
are assigned to viewsets. This mixin should be removed afterwards.
"""
# The text above becomes the viewset’s doc string otherwise and is displayed in
# the generated OpenAPI schema.
__doc__
=
None
def
check_object_permissions
(
self
,
request
,
obj
):
pass
class
NestedObjectFinderMixin
:
class
NestedObjectFinderMixin
:
ROUTE_FILTER_LOOKUPS
=
{}
ROUTE_FILTER_LOOKUPS
=
{}
...
...
This diff is collapsed.
Click to expand it.
program/views.py
+
2
−
11
View file @
cf8aad60
...
@@ -80,12 +80,7 @@ from program.serializers import (
...
@@ -80,12 +80,7 @@ from program.serializers import (
UserSerializer
,
UserSerializer
,
)
)
from
program.services
import
get_timerange_timeslots
,
resolve_conflicts
from
program.services
import
get_timerange_timeslots
,
resolve_conflicts
from
program.utils
import
(
from
program.utils
import
NestedObjectFinderMixin
,
get_values
,
parse_date
DisabledObjectPermissionCheckMixin
,
NestedObjectFinderMixin
,
get_values
,
parse_date
,
)
logger
=
logging
.
getLogger
(
__name__
)
logger
=
logging
.
getLogger
(
__name__
)
...
@@ -252,7 +247,6 @@ def json_playout(request):
...
@@ -252,7 +247,6 @@ def json_playout(request):
),
),
)
)
class
APIUserViewSet
(
class
APIUserViewSet
(
DisabledObjectPermissionCheckMixin
,
mixins
.
CreateModelMixin
,
mixins
.
CreateModelMixin
,
mixins
.
RetrieveModelMixin
,
mixins
.
RetrieveModelMixin
,
mixins
.
UpdateModelMixin
,
mixins
.
UpdateModelMixin
,
...
@@ -362,7 +356,7 @@ class APIImageViewSet(viewsets.ModelViewSet):
...
@@ -362,7 +356,7 @@ class APIImageViewSet(viewsets.ModelViewSet):
destroy
=
extend_schema
(
summary
=
"
Delete an existing show.
"
),
destroy
=
extend_schema
(
summary
=
"
Delete an existing show.
"
),
list
=
extend_schema
(
summary
=
"
List all shows.
"
),
list
=
extend_schema
(
summary
=
"
List all shows.
"
),
)
)
class
APIShowViewSet
(
DisabledObjectPermissionCheckMixin
,
viewsets
.
ModelViewSet
):
class
APIShowViewSet
(
viewsets
.
ModelViewSet
):
queryset
=
Show
.
objects
.
all
()
queryset
=
Show
.
objects
.
all
()
serializer_class
=
ShowSerializer
serializer_class
=
ShowSerializer
pagination_class
=
LimitOffsetPagination
pagination_class
=
LimitOffsetPagination
...
@@ -521,7 +515,6 @@ class APIRRuleViewSet(viewsets.ModelViewSet):
...
@@ -521,7 +515,6 @@ class APIRRuleViewSet(viewsets.ModelViewSet):
list
=
extend_schema
(
summary
=
"
List all schedules.
"
),
list
=
extend_schema
(
summary
=
"
List all schedules.
"
),
)
)
class
APIScheduleViewSet
(
class
APIScheduleViewSet
(
DisabledObjectPermissionCheckMixin
,
NestedObjectFinderMixin
,
NestedObjectFinderMixin
,
viewsets
.
ModelViewSet
,
viewsets
.
ModelViewSet
,
):
):
...
@@ -655,7 +648,6 @@ class APIScheduleViewSet(
...
@@ -655,7 +648,6 @@ class APIScheduleViewSet(
),
),
)
)
class
APITimeSlotViewSet
(
class
APITimeSlotViewSet
(
DisabledObjectPermissionCheckMixin
,
NestedObjectFinderMixin
,
NestedObjectFinderMixin
,
mixins
.
RetrieveModelMixin
,
mixins
.
RetrieveModelMixin
,
mixins
.
UpdateModelMixin
,
mixins
.
UpdateModelMixin
,
...
@@ -705,7 +697,6 @@ class APITimeSlotViewSet(
...
@@ -705,7 +697,6 @@ class APITimeSlotViewSet(
list
=
extend_schema
(
summary
=
"
List all notes.
"
),
list
=
extend_schema
(
summary
=
"
List all notes.
"
),
)
)
class
APINoteViewSet
(
class
APINoteViewSet
(
DisabledObjectPermissionCheckMixin
,
NestedObjectFinderMixin
,
NestedObjectFinderMixin
,
viewsets
.
ModelViewSet
,
viewsets
.
ModelViewSet
,
):
):
...
...
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