Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
feudal
feudalBackend
Commits
1dacf811
Commit
1dacf811
authored
Jul 25, 2018
by
Lukas Burgey
Browse files
Move some code to module initializers
parent
2038fdda
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
django_backend/backend/admin.py
View file @
1dacf811
...
...
@@ -2,8 +2,9 @@ from django.contrib import admin
from
django.contrib.auth.admin
import
UserAdmin
from
django.contrib.auth.models
import
Group
from
.
import
models
from
.models
import
brokers
as
broker_models
from
.auth.v1.models
import
OIDCConfig
from
.models
import
models
,
brokers
as
broker_models
class
TypeFilter
(
admin
.
SimpleListFilter
):
...
...
django_backend/backend/auth/v1/views/clients.py
View file @
1dacf811
...
...
@@ -7,7 +7,7 @@ from django.http import HttpResponse
from
django.contrib.auth
import
authenticate
from
django.contrib.sessions.models
import
Session
from
....models
.models
import
Site
from
....models
import
Site
from
....models.brokers
import
RabbitMQInstance
from
....models.users
import
User
...
...
django_backend/backend/models/__init__.py
View file @
1dacf811
This diff is collapsed.
Click to expand it.
django_backend/backend/models/models.py
deleted
100644 → 0
View file @
2038fdda
This diff is collapsed.
Click to expand it.
django_backend/backend/models/serializers/__init__.py
View file @
1dacf811
# we don't need to deserialize, so we do not implement the abstract methods
# pylint: disable=abstract-method
from
django.contrib.auth.models
import
Group
from
rest_framework
import
serializers
from
...models
import
SSHPublicKey
class
GroupSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
Group
fields
=
[
'id'
,
'name'
,
]
class
SSHPublicKeySerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
SSHPublicKey
fields
=
[
'id'
,
'name'
,
'key'
,
]
class
SSHPublicKeyRefSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
SSHPublicKey
fields
=
[
'id'
,
'name'
,
]
django_backend/backend/models/serializers/clients.py
View file @
1dacf811
...
...
@@ -4,10 +4,10 @@
from
django_mysql.models
import
JSONField
from
rest_framework
import
serializers
from
..
import
models
from
..
.
import
models
from
..users
import
User
from
..brokers
import
RabbitMQInstance
from
.
serializers
import
GroupSerializer
,
SSHPublicKeySerializer
from
.
import
GroupSerializer
,
SSHPublicKeySerializer
class
ServiceSerializer
(
serializers
.
ModelSerializer
):
...
...
django_backend/backend/models/serializers/serializers.py
deleted
100644 → 0
View file @
2038fdda
# we don't need to deserialize, so we do not implement the abstract methods
# pylint: disable=abstract-method
from
django.contrib.auth.models
import
Group
from
rest_framework
import
serializers
from
..models
import
SSHPublicKey
class
GroupSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
Group
fields
=
[
'id'
,
'name'
,
]
class
SSHPublicKeySerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
SSHPublicKey
fields
=
[
'id'
,
'name'
,
'key'
,
]
class
SSHPublicKeyRefSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
SSHPublicKey
fields
=
[
'id'
,
'name'
,
]
django_backend/backend/models/serializers/webpage.py
View file @
1dacf811
...
...
@@ -3,9 +3,9 @@
from
rest_framework
import
serializers
from
..
import
models
from
..
.
import
models
from
..users
import
User
from
.
import
serializers
as
backend_serializers
from
.
.
import
serializers
as
backend_serializers
class
SiteSerializer
(
serializers
.
ModelSerializer
):
...
...
django_backend/backend/models/test_models.py
View file @
1dacf811
...
...
@@ -5,7 +5,7 @@ from django.contrib import auth
from
django.contrib.auth.models
import
Group
from
django.test
import
TestCase
from
django_backend.backend
.models
import
models
from
django_backend.backend
import
models
from
django_backend.backend.auth.v1
import
models
as
auth_models
LOGGER
=
logging
.
getLogger
(
__name__
)
...
...
django_backend/backend/models/users.py
View file @
1dacf811
...
...
@@ -158,7 +158,7 @@ class User(AbstractUser):
return
'DEACTIVATED USER {}'
.
format
(
self
.
username
)
return
'USER {}'
.
format
(
self
.
username
)
elif
self
.
user_type
==
'apiclient'
:
from
.
models
import
Site
from
.
import
Site
try
:
return
'APICLIENT {}@{}'
.
format
(
self
.
username
,
self
.
site
)
except
Site
.
DoesNotExist
:
...
...
@@ -236,7 +236,7 @@ class User(AbstractUser):
unity_key_value
=
userinfo
.
get
(
'ssh_key'
,
''
)
unity_key_name
=
'unity_key'
from
.
models
import
SSHPublicKey
from
.
import
SSHPublicKey
try
:
key
=
self
.
_ssh_keys
.
get
(
name
=
unity_key_name
)
if
key
.
key
!=
unity_key_value
:
...
...
django_backend/backend/views/clients.py
View file @
1dacf811
...
...
@@ -9,7 +9,7 @@ from rest_framework.response import Response
from
..models.brokers
import
RabbitMQInstance
from
..models.serializers.webpage
import
DeploymentStateSerializer
from
..models.serializers.clients
import
RabbitMQInstanceSerializer
from
..
models
import
models
from
..
import
models
LOGGER
=
logging
.
getLogger
(
__name__
)
...
...
django_backend/backend/views/webpage.py
View file @
1dacf811
...
...
@@ -8,8 +8,9 @@ from rest_framework import views
from
rest_framework.permissions
import
AllowAny
from
rest_framework.response
import
Response
from
..models
import
models
from
..models.serializers
import
webpage
as
serializers
,
serializers
as
model_serializers
from
..
import
models
from
..models.serializers
import
webpage
as
serializers
from
..models
import
serializers
as
model_serializers
LOGGER
=
logging
.
getLogger
(
__name__
)
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment