Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
feudal
feudalBackend
Commits
50d4f165
Commit
50d4f165
authored
Feb 27, 2020
by
Lukas Burgey
Browse files
Remove services property from user
It missbehaved in tests but not in a running setup.
parent
b0454c61
Changes
2
Hide whitespace changes
Inline
Side-by-side
feudal/backend/models/users.py
View file @
50d4f165
...
...
@@ -102,19 +102,6 @@ class User(AbstractUser):
'ssh_key'
:
self
.
ssh_keys
.
all
(),
}
# services returns all services this user has access to
@
property
def
services
(
self
):
queryset
=
None
for
vo
in
self
.
vos
.
all
():
if
queryset
is
None
:
queryset
=
vo
.
services
.
all
()
else
:
queryset
.
union
(
vo
.
services
.
all
())
return
queryset
@
property
def
is_active_at_clients
(
self
):
return
self
.
_is_active
...
...
feudal/backend/views/rest.py
View file @
50d4f165
...
...
@@ -85,7 +85,7 @@ class ServiceListView(generics.ListAPIView):
serializer_class
=
ServiceSerializer
def
get_queryset
(
self
):
return
self
.
request
.
user
.
services
.
all
(
)
return
Service
.
objects
.
filter
(
vos__user
=
self
.
request
.
user
)
class
ServiceView
(
generics
.
RetrieveAPIView
):
...
...
@@ -94,7 +94,7 @@ class ServiceView(generics.RetrieveAPIView):
def
get_object
(
self
):
return
get_object_or_404
(
self
.
request
.
user
.
services
.
all
(
),
Service
.
objects
.
filter
(
vos__user
=
self
.
request
.
user
),
id
=
self
.
kwargs
[
'id'
],
)
...
...
@@ -191,7 +191,7 @@ class DeploymentView(generics.RetrieveUpdateAPIView):
if
self
.
kwargs
[
'type'
]
==
'service'
:
try
:
service
=
self
.
request
.
user
.
se
rvices
.
get
(
id
=
dep_id
)
service
=
Service
.
objects
.
get
(
vos__
user
=
se
lf
.
request
.
user
,
id
=
dep_id
)
dep
,
created
=
ServiceDeployment
.
objects
.
get_or_create
(
user
=
self
.
request
.
user
,
service
=
service
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment