Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rex Dri
Rex Dri
Commits
041d5304
Commit
041d5304
authored
Aug 25, 2018
by
Florent Chehab
Browse files
File reorganization
parent
be54f018
Changes
6
Hide whitespace changes
Inline
Side-by-side
backend/models/moderation/__init__.py
0 → 100644
View file @
041d5304
from
.myModel
import
MyModel
# noqa: F401
from
.myModelSerializer
import
MyModelSerializer
# noqa: F401
backend/models/moderation/myModel.py
0 → 100644
View file @
041d5304
from
django.db
import
models
from
django.contrib.auth.models
import
User
from
rest_framework
import
serializers
# from backend.signals import new_revision_saved
# import reversion
from
django.utils
import
timezone
from
backend.models.tools
import
PendingModeration
from
django.conf
import
settings
from
django.contrib.contenttypes.models
import
ContentType
class
MyModel
(
models
.
Model
):
"""
All models in the app deppend of this one.
It contains the required attributes for managing eventual moderation data.
All the logic behind moderation is done in myModelSerializer
"""
moderated_by
=
models
.
ForeignKey
(
User
,
null
=
True
,
on_delete
=
models
.
SET_NULL
,
related_name
=
'moderated'
)
moderated_on
=
models
.
DateTimeField
(
null
=
True
)
updated_on
=
models
.
DateTimeField
(
null
=
True
)
updated_by
=
models
.
ForeignKey
(
User
,
null
=
True
,
on_delete
=
models
.
SET_NULL
,
related_name
=
'updated'
)
class
Meta
:
abstract
=
True
# class MyModelVersionned(MyModel):
# class Meta:
# abstract = True
backend/models/mod
ule
/myModel.py
→
backend/models/mod
eration
/myModel
Serializer
.py
View file @
041d5304
from
django.db
import
models
from
django.contrib.auth.models
import
User
from
rest_framework
import
serializers
# from backend.signals import new_revision_saved
# import reversion
from
django.utils
import
timezone
from
backend.models.tools
import
PendingModeration
from
django.conf
import
settings
from
django.contrib.contenttypes.models
import
ContentType
class
MyModel
(
models
.
Model
):
"""
All models in the app deppend of this one !
"""
moderated_by
=
models
.
ForeignKey
(
User
,
null
=
True
,
on_delete
=
models
.
SET_NULL
,
related_name
=
'moderated'
)
moderated_on
=
models
.
DateTimeField
(
null
=
True
)
updated_on
=
models
.
DateTimeField
(
null
=
True
)
updated_by
=
models
.
ForeignKey
(
User
,
null
=
True
,
on_delete
=
models
.
SET_NULL
,
related_name
=
'updated'
)
class
Meta
:
abstract
=
True
# class MyModelVersionned(MyModel):
# class Meta:
# abstract = True
def
is_member
(
group_name
,
user
):
return
user
.
groups
.
filter
(
name
=
group_name
).
exists
()
from
.myModel
import
MyModel
class
MyModelSerializer
(
serializers
.
ModelSerializer
):
...
...
backend/models/module/__init__.py
View file @
041d5304
...
...
@@ -4,5 +4,4 @@ from .scholarship import Scholarship # noqa: F401
from
.photo
import
Photo
# noqa: F401
from
.driRestrictedModule
import
DriRestrictedModule
,
DriRestrictedModuleSerializer
# noqa: F401
from
.currency
import
Currency
,
CurrencyViewSet
,
CurrencySerializer
# noqa: F401
from
.myModel
import
MyModel
,
MyModelSerializer
# noqa: F401
# MyModelVersionned, MyModelVersionnedSerializer # noqa: F401
backend/models/university/university.py
View file @
041d5304
from
django.db
import
models
from
backend.models.mod
ule
import
MyModel
from
backend.models.mod
eration
import
MyModel
from
backend.utils.friendly_path
import
friendly_path
path_and_rename
=
friendly_path
(
"uploads/universities/logos/"
,
'name'
)
...
...
backend/models/university/universityAPI.py
View file @
041d5304
...
...
@@ -2,7 +2,7 @@ from backend.models.university import University
from
rest_framework
import
viewsets
,
permissions
from
backend.models.university.campus
import
CampusSerializer
from
backend.models.tools
import
NoDeleteIfNotAdmin
from
backend.models.mod
ule
import
MyModelSerializer
from
backend.models.mod
eration
import
MyModelSerializer
class
UniversitySerializer
(
MyModelSerializer
):
...
...
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