Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
R
red-ci-cd
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
red-group-test
red-ci-cd
Commits
a966fed8
Commit
a966fed8
authored
Oct 02, 2019
by
eduardmisa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
models to dict implemented
parent
b8d61244
Changes
37
Hide whitespace changes
Inline
Side-by-side
Showing
37 changed files
with
66 additions
and
39 deletions
+66
-39
app/applicationlayer/cms/allowed_company/serializer.py
app/applicationlayer/cms/allowed_company/serializer.py
+1
-1
app/applicationlayer/cms/form/approver/serializers.py
app/applicationlayer/cms/form/approver/serializers.py
+1
-1
app/applicationlayer/cms/form/attachment/serializers.py
app/applicationlayer/cms/form/attachment/serializers.py
+1
-1
app/applicationlayer/cms/form/details/serializers.py
app/applicationlayer/cms/form/details/serializers.py
+1
-1
app/applicationlayer/cms/form/header/serializers.py
app/applicationlayer/cms/form/header/serializers.py
+1
-1
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+1
-1
app/applicationlayer/cms/form/serializers.py
app/applicationlayer/cms/form/serializers.py
+1
-1
app/applicationlayer/cms/form/stakeholder/serializers.py
app/applicationlayer/cms/form/stakeholder/serializers.py
+1
-1
app/applicationlayer/cms/form/views.py
app/applicationlayer/cms/form/views.py
+1
-1
app/applicationlayer/cms/master/form/department/serializer.py
...applicationlayer/cms/master/form/department/serializer.py
+1
-1
app/applicationlayer/cms/master/form/department/views.py
app/applicationlayer/cms/master/form/department/views.py
+1
-1
app/applicationlayer/cms/master/template/department/serializer.py
...icationlayer/cms/master/template/department/serializer.py
+1
-1
app/applicationlayer/cms/master/template/department/views.py
app/applicationlayer/cms/master/template/department/views.py
+1
-1
app/applicationlayer/cms/template/approver/serializers.py
app/applicationlayer/cms/template/approver/serializers.py
+1
-1
app/applicationlayer/cms/template/attachment/serializers.py
app/applicationlayer/cms/template/attachment/serializers.py
+1
-1
app/applicationlayer/cms/template/details/serializers.py
app/applicationlayer/cms/template/details/serializers.py
+1
-1
app/applicationlayer/cms/template/header/serializers.py
app/applicationlayer/cms/template/header/serializers.py
+1
-1
app/applicationlayer/cms/template/header/views.py
app/applicationlayer/cms/template/header/views.py
+1
-1
app/applicationlayer/cms/template/serializers.py
app/applicationlayer/cms/template/serializers.py
+1
-1
app/applicationlayer/cms/template/stakeholder/serializers.py
app/applicationlayer/cms/template/stakeholder/serializers.py
+1
-1
app/applicationlayer/cms/template/views.py
app/applicationlayer/cms/template/views.py
+1
-1
app/applicationlayer/cms/utils_cr.py
app/applicationlayer/cms/utils_cr.py
+1
-1
app/applicationlayer/management/account/serializer.py
app/applicationlayer/management/account/serializer.py
+1
-1
app/applicationlayer/management/account/views.py
app/applicationlayer/management/account/views.py
+1
-1
app/applicationlayer/management/application/views.py
app/applicationlayer/management/application/views.py
+1
-1
app/applicationlayer/management/company/views.py
app/applicationlayer/management/company/views.py
+1
-1
app/applicationlayer/management/department/views.py
app/applicationlayer/management/department/views.py
+1
-1
app/applicationlayer/management/module/views.py
app/applicationlayer/management/module/views.py
+1
-1
app/applicationlayer/management/user/views.py
app/applicationlayer/management/user/views.py
+1
-1
app/applicationlayer/master/Account/serializer.py
app/applicationlayer/master/Account/serializer.py
+1
-1
app/applicationlayer/master/Account/views.py
app/applicationlayer/master/Account/views.py
+1
-1
app/applicationlayer/master/department/serializer.py
app/applicationlayer/master/department/serializer.py
+1
-1
app/applicationlayer/master/department/views.py
app/applicationlayer/master/department/views.py
+1
-1
app/applicationlayer/utils.py
app/applicationlayer/utils.py
+30
-3
app/businesslayer/changerequest/change_request.py
app/businesslayer/changerequest/change_request.py
+1
-1
app/businesslayer/changerequest/change_request_template.py
app/businesslayer/changerequest/change_request_template.py
+1
-1
app/businesslayer/department/views.py
app/businesslayer/department/views.py
+1
-1
No files found.
app/applicationlayer/cms/allowed_company/serializer.py
View file @
a966fed8
from
rest_framework
import
serializers
from
app.entities.models
import
AllowedCompany
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
AllowedCompanySerializer
(
serializers
.
ModelSerializer
):
...
...
app/applicationlayer/cms/form/approver/serializers.py
View file @
a966fed8
from
app.entities
import
models
from
rest_framework
import
serializers
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
ChangeRequestFormApproversSerializer
(
...
...
app/applicationlayer/cms/form/attachment/serializers.py
View file @
a966fed8
from
app.entities
import
models
from
rest_framework
import
serializers
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
ChangeRequestFormAttachmentsSerializer
(
...
...
app/applicationlayer/cms/form/details/serializers.py
View file @
a966fed8
from
app.entities
import
models
from
rest_framework
import
serializers
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
ChangeRequestFormDetailsSerializer
(
...
...
app/applicationlayer/cms/form/header/serializers.py
View file @
a966fed8
from
app.entities
import
models
from
rest_framework
import
serializers
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
django.db.models
import
Q
from
app.applicationlayer.cms.form.approver.serializers
import
ChangeRequestFormApproversSerializer
...
...
app/applicationlayer/cms/form/header/views.py
View file @
a966fed8
...
...
@@ -30,7 +30,7 @@ from app.applicationlayer.cms.utils_cr import (number_generator,
entity_log_bulk
)
from
app.entities
import
enums
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
import
json
from
django.shortcuts
import
get_object_or_404
from
django.db.models
import
Min
...
...
app/applicationlayer/cms/form/serializers.py
View file @
a966fed8
...
...
@@ -2,7 +2,7 @@ from app.entities import models
from
rest_framework
import
serializers
from
django.db.models
import
Q
from
drf_writable_nested
import
WritableNestedModelSerializer
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
ChangeRequestFormApproversSerializer
(
...
...
app/applicationlayer/cms/form/stakeholder/serializers.py
View file @
a966fed8
from
app.entities
import
models
from
rest_framework
import
serializers
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
ChangeRequestFormStakeHoldersSerializer
(
...
...
app/applicationlayer/cms/form/views.py
View file @
a966fed8
...
...
@@ -31,7 +31,7 @@ from app.applicationlayer.cms.utils_cr import (number_generator,
generate_template_id
,
crhistory_create_save
)
from
app.entities
import
enums
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
import
json
from
django.shortcuts
import
get_object_or_404
from
django.db.models
import
Min
...
...
app/applicationlayer/cms/master/form/department/serializer.py
View file @
a966fed8
from
rest_framework
import
serializers
from
app.entities.models
import
Department
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
AdminDepartmentSerializer
(
serializers
.
ModelSerializer
):
...
...
app/applicationlayer/cms/master/form/department/views.py
View file @
a966fed8
from
rest_framework
import
viewsets
,
status
from
rest_framework.response
import
Response
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
rest_framework.filters
import
SearchFilter
,
OrderingFilter
from
django_filters
import
rest_framework
as
filters
from
app.entities.models
import
Department
,
AllowedCompany
...
...
app/applicationlayer/cms/master/template/department/serializer.py
View file @
a966fed8
from
rest_framework
import
serializers
from
app.entities.models
import
Department
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
AdminDepartmentSerializer
(
serializers
.
ModelSerializer
):
...
...
app/applicationlayer/cms/master/template/department/views.py
View file @
a966fed8
from
rest_framework
import
viewsets
,
status
from
rest_framework.response
import
Response
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
rest_framework.filters
import
SearchFilter
,
OrderingFilter
from
django_filters
import
rest_framework
as
filters
from
app.entities.models
import
Department
,
AllowedCompany
...
...
app/applicationlayer/cms/template/approver/serializers.py
View file @
a966fed8
from
rest_framework
import
serializers
from
app.entities
import
models
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
ChangeRequestTemplateApproversSerializer
(
...
...
app/applicationlayer/cms/template/attachment/serializers.py
View file @
a966fed8
from
rest_framework
import
serializers
from
app.entities
import
models
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
ChangeRequestTemplateAttachmentsSerializer
(
...
...
app/applicationlayer/cms/template/details/serializers.py
View file @
a966fed8
from
rest_framework
import
serializers
from
app.entities
import
models
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
ChangeRequestTemplateDetailsSerializer
(
...
...
app/applicationlayer/cms/template/header/serializers.py
View file @
a966fed8
...
...
@@ -2,7 +2,7 @@ from app.entities import models
from
rest_framework
import
serializers
from
django.db.models
import
Q
from
django.conf
import
settings
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
drf_writable_nested
import
WritableNestedModelSerializer
from
app.applicationlayer.cms.utils_cr
import
(
get_account_details
,
get_dept_details
,
...
...
app/applicationlayer/cms/template/header/views.py
View file @
a966fed8
...
...
@@ -16,7 +16,7 @@ from app.applicationlayer.utils import (CustomPagination,
from
app.applicationlayer.cms.utils_cr
import
(
entity_log_bulk
)
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
app.entities
import
enums
,
models
from
django.db.models
import
Q
...
...
app/applicationlayer/cms/template/serializers.py
View file @
a966fed8
from
app.entities
import
models
from
rest_framework
import
serializers
from
django.db.models
import
Q
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
drf_writable_nested
import
WritableNestedModelSerializer
from
app.applicationlayer.cms.utils_cr
import
(
get_account_details
,
get_dept_details
,
...
...
app/applicationlayer/cms/template/stakeholder/serializers.py
View file @
a966fed8
from
rest_framework
import
serializers
from
app.entities
import
models
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
ChangeRequestTemplateStakeHoldersSerializer
(
...
...
app/applicationlayer/cms/template/views.py
View file @
a966fed8
...
...
@@ -18,7 +18,7 @@ from app.applicationlayer.utils import (CustomPagination,
from
app.applicationlayer.cms.utils_cr
import
(
entity_log_bulk
)
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
app.entities
import
enums
,
models
from
django.db.models
import
Q
...
...
app/applicationlayer/cms/utils_cr.py
View file @
a966fed8
...
...
@@ -10,7 +10,7 @@ from app.applicationlayer.utils import main_threading, notification_create
from
app.helper.email_service
import
sender
from
app.applicationlayer.utils
import
log_save
from
app.entities
import
enums
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
rest_framework.exceptions
import
ParseError
from
django.db
import
IntegrityError
from
rest_framework.exceptions
import
APIException
...
...
app/applicationlayer/management/account/serializer.py
View file @
a966fed8
...
...
@@ -4,7 +4,7 @@ import ast
from
django.contrib.auth.hashers
import
make_password
,
check_password
import
re
from
django.contrib.auth
import
authenticate
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
UserSerializer
(
serializers
.
ModelSerializer
):
...
...
app/applicationlayer/management/account/views.py
View file @
a966fed8
...
...
@@ -10,7 +10,7 @@ from rest_framework.decorators import action
from
django.contrib.auth
import
authenticate
from
django.contrib.auth.hashers
import
check_password
from
rest_framework.response
import
Response
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
app.entities.models
import
(
User
,
EntityLog
,
PasswordReset
,
Application
,
UserImage
)
...
...
app/applicationlayer/management/application/views.py
View file @
a966fed8
...
...
@@ -3,7 +3,7 @@ from django.db import transaction
from
app.helper
import
decorators
from
rest_framework
import
viewsets
,
status
from
rest_framework.response
import
Response
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
rest_framework.filters
import
SearchFilter
,
OrderingFilter
from
django_filters
import
rest_framework
as
filters
from
app.entities.models
import
Application
,
EntityLog
...
...
app/applicationlayer/management/company/views.py
View file @
a966fed8
...
...
@@ -2,7 +2,7 @@ from app.entities import enums
from
django.db
import
transaction
from
rest_framework
import
viewsets
,
status
from
rest_framework.response
import
Response
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
rest_framework.filters
import
SearchFilter
,
OrderingFilter
from
django_filters
import
rest_framework
as
filters
from
app.entities.models
import
Company
,
EntityLog
...
...
app/applicationlayer/management/department/views.py
View file @
a966fed8
...
...
@@ -2,7 +2,7 @@ from app.entities import enums
from
django.db
import
transaction
from
rest_framework
import
viewsets
,
status
from
rest_framework.response
import
Response
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
rest_framework.filters
import
SearchFilter
,
OrderingFilter
from
django_filters
import
rest_framework
as
filters
from
app.entities.models
import
Department
,
EntityLog
...
...
app/applicationlayer/management/module/views.py
View file @
a966fed8
...
...
@@ -2,7 +2,7 @@ from app.entities import enums
from
django.db
import
transaction
from
rest_framework
import
viewsets
,
status
from
rest_framework.response
import
Response
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
rest_framework.filters
import
SearchFilter
,
OrderingFilter
from
django_filters
import
rest_framework
as
filters
from
app.entities.models
import
Module
,
EntityLog
...
...
app/applicationlayer/management/user/views.py
View file @
a966fed8
...
...
@@ -3,7 +3,7 @@ import json
from
app.entities
import
enums
# from app.businesslayer import log_save
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
django.shortcuts
import
render
from
rest_framework.response
import
Response
...
...
app/applicationlayer/master/Account/serializer.py
View file @
a966fed8
from
rest_framework
import
serializers
from
app.entities.models
import
User
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
AdminAccountSerializer
(
serializers
.
ModelSerializer
):
...
...
app/applicationlayer/master/Account/views.py
View file @
a966fed8
from
rest_framework
import
viewsets
,
status
from
rest_framework.response
import
Response
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
rest_framework.filters
import
SearchFilter
,
OrderingFilter
from
django_filters
import
rest_framework
as
filters
from
app.entities.models
import
User
...
...
app/applicationlayer/master/department/serializer.py
View file @
a966fed8
from
rest_framework
import
serializers
from
app.entities.models
import
Department
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
class
AdminDepartmentSerializer
(
serializers
.
ModelSerializer
):
...
...
app/applicationlayer/master/department/views.py
View file @
a966fed8
from
rest_framework
import
viewsets
,
status
from
rest_framework.response
import
Response
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
rest_framework.filters
import
SearchFilter
,
OrderingFilter
from
django_filters
import
rest_framework
as
filters
from
app.entities.models
import
Department
...
...
app/applicationlayer/utils.py
View file @
a966fed8
...
...
@@ -4,14 +4,41 @@ from rest_framework.response import Response
from
functools
import
wraps
from
app.entities
import
enums
from
app.entities.models
import
EntityLog
,
Notification
from
django.forms.models
import
model_to_dict
from
django.conf
import
settings
from
websocket
import
create_connection
import
json
from
rest_framework
import
status
from
rest_framework
import
serializers
import
copy
import
json
REALTIMESERVER_IP
=
settings
.
REALTIMESERVER_IP
def
from
app
.
applicationlayer
.
utils
import
model_to_dict
(
instance
):
try
:
mySerializer
=
copy
.
deepcopy
(
DynamicSerializer
)
mySerializer
.
Meta
.
model
=
instance
.
__class__
dataPre
=
mySerializer
(
instance
)
.
data
strData
=
json
.
dumps
(
dataPre
)
return
strData
except
expression
as
identifier
:
return
'Serialization Error'
class
DynamicSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
None
fields
=
'__all__'
class
CustomPagination
(
PageNumberPagination
):
page_size
=
10
max_page_size
=
50
...
...
@@ -40,7 +67,7 @@ class CustomPagination(PageNumberPagination):
# req_method = enums.LogEnum.DELETED.value
# elif req_method.upper == 'PUT':
# req_method = enums.LogEnum.UPDATE.value
# from_instance = model_to_dict(self.get_object())
# from_instance =
from app.applicationlayer.utils import
model_to_dict(self.get_object())
# print("self.serializer.data['id']")
# print(self.serializer.data['id'])
# EntityLog.objects.create(
...
...
@@ -57,7 +84,7 @@ def log_save(action, entity, row_id, fromValue, toValue):
EntityLog
.
objects
.
create
(
action
=
action
,
entity
=
entity
,
row_id
=
row_id
,
row_id
=
int
(
row_id
)
,
fromValue
=
fromValue
,
toValue
=
toValue
)
...
...
app/businesslayer/changerequest/change_request.py
View file @
a966fed8
...
...
@@ -16,7 +16,7 @@ from app.applicationlayer.cms.utils_cr import (
number_generator
,
crhistory_save
,
entity_log_bulk
,
crhistory_log_bulk_delete
)
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
app.entities
import
enums
,
models
from
app.applicationlayer.utils
import
log_save
,
CustomPagination
from
app.applicationlayer.cms.template
import
serializers
...
...
app/businesslayer/changerequest/change_request_template.py
View file @
a966fed8
...
...
@@ -15,7 +15,7 @@ from django.db.models import Q
from
app.applicationlayer.cms.utils_cr
import
(
number_generator
,
crhistory_save
,
entity_log_bulk
)
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
app.entities
import
enums
,
models
from
app.applicationlayer.utils
import
log_save
,
CustomPagination
from
app.applicationlayer.cms.template
import
serializers
...
...
app/businesslayer/department/views.py
View file @
a966fed8
from
rest_framework
import
viewsets
,
status
from
rest_framework.response
import
Response
from
django.forms.mode
ls
import
model_to_dict
from
app.applicationlayer.uti
ls
import
model_to_dict
from
rest_framework.filters
import
SearchFilter
,
OrderingFilter
from
django_filters
import
rest_framework
as
filters
from
app.entities.models
import
Department
...
...
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