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
53b74b25
Commit
53b74b25
authored
Sep 26, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
serializers template
parent
ac939fac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
41 deletions
+36
-41
app/applicationlayer/cms/template/approver/serializers.py
app/applicationlayer/cms/template/approver/serializers.py
+1
-1
app/applicationlayer/cms/template/serializers.py
app/applicationlayer/cms/template/serializers.py
+5
-7
app/applicationlayer/cms/template/views.py
app/applicationlayer/cms/template/views.py
+30
-33
No files found.
app/applicationlayer/cms/template/approver/serializers.py
View file @
53b74b25
...
@@ -20,7 +20,7 @@ class ChangeRequestTemplateApproversSerializer(
...
@@ -20,7 +20,7 @@ class ChangeRequestTemplateApproversSerializer(
ret
[
'company'
]
=
model_to_dict
(
instance
.
user
.
department
.
company
)
ret
[
'company'
]
=
model_to_dict
(
instance
.
user
.
department
.
company
)
ret
[
'department'
]
=
model_to_dict
(
instance
.
user
.
department
)
ret
[
'department'
]
=
model_to_dict
(
instance
.
user
.
department
)
ret
[
'user'
]
=
user_object
ret
[
'user'
]
=
user_object
return
ret
return
ret
except
Exception
as
e
:
except
Exception
as
e
:
ret
[
'company'
]
=
"none"
ret
[
'company'
]
=
"none"
...
...
app/applicationlayer/cms/template/serializers.py
View file @
53b74b25
...
@@ -7,7 +7,6 @@ from app.applicationlayer.cms.utils_cr import (get_account_details,
...
@@ -7,7 +7,6 @@ from app.applicationlayer.cms.utils_cr import (get_account_details,
get_dept_details
,
get_dept_details
,
get_companies_details
)
get_companies_details
)
from
app.applicationlayer.cms.template.approver.serializers
import
ChangeRequestTemplateApproversSerializer
from
app.applicationlayer.cms.template.approver.serializers
import
ChangeRequestTemplateApproversSerializer
from
app.applicationlayer.cms.template.stakeholder.serializers
import
ChangeRequestTemplateStakeHoldersSerializer
from
app.applicationlayer.cms.template.stakeholder.serializers
import
ChangeRequestTemplateStakeHoldersSerializer
...
@@ -45,15 +44,14 @@ class ChangeRequestTemplatesSerializer(
...
@@ -45,15 +44,14 @@ class ChangeRequestTemplatesSerializer(
def
to_representation
(
self
,
instance
):
def
to_representation
(
self
,
instance
):
ret
=
super
()
.
to_representation
(
instance
)
ret
=
super
()
.
to_representation
(
instance
)
try
:
try
:
ret
[
'company'
]
=
model_to_dict
(
instance
.
user
.
department
.
company
)
ret
[
'company'
]
=
instance
.
requested_to_company
.
name
ret
[
'department'
]
=
model_to_dict
(
instance
.
user
.
department
)
ret
[
'department'
]
=
instance
.
requested_to_department
.
name
ret
[
'point_of_contact'
]
=
model_to_dict
(
instance
.
requested_to_user
)
ret
[
'point_of_contact'
]
=
instance
.
requested_to_user
.
name
ret
[
'created_by'
]
=
instance
.
created_by_user
.
cod
e
ret
[
'created_by'
]
=
instance
.
created_by_user
.
nam
e
return
ret
return
ret
except
Exception
as
e
:
except
Exception
as
e
:
ret
[
'company'
]
=
"none"
ret
[
'company'
]
=
"none"
ret
[
'department'
]
=
"none"
ret
[
'department'
]
=
"none"
ret
[
'point_of_contact'
]
=
"none"
ret
[
'point_of_contact'
]
=
"none"
...
...
app/applicationlayer/cms/template/views.py
View file @
53b74b25
...
@@ -219,7 +219,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
...
@@ -219,7 +219,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
@
transaction
.
atomic
@
transaction
.
atomic
def
partial_update
(
self
,
request
,
*
args
,
**
kwargs
):
def
partial_update
(
self
,
request
,
*
args
,
**
kwargs
):
partial
=
kwargs
.
pop
(
'partial'
,
Fals
e
)
partial
=
kwargs
.
pop
(
'partial'
,
Tru
e
)
instance
=
self
.
get_object
()
instance
=
self
.
get_object
()
template_no
=
kwargs
[
'template_no'
]
template_no
=
kwargs
[
'template_no'
]
...
@@ -256,39 +256,36 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
...
@@ -256,39 +256,36 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
self
,
self
,
template_no
template_no
)
)
tmp_add_edit_delete
(
body_data
[
'tmp_stakes'
],
models
.
ChangeRequestTemplateStakeHolders
,
enums
.
LogEntitiesEnum
.
ChangeRequestTemplateStakeHolders
.
value
,
serializers
.
ChangeRequestTemplateStakeHoldersSerializer
,
partial
,
self
,
template_no
)
if
body_data
[
'tmp_stakes'
]:
tmp_add_edit_delete
(
tmp_add_edit_delete
(
body_data
[
'tmp_attachments'
],
body_data
[
'tmp_stakes'
],
models
.
ChangeRequestTemplateAttachments
,
models
.
ChangeRequestTemplateStakeHolders
,
enums
.
LogEntitiesEnum
.
ChangeRequestTemplateAttachments
.
value
,
enums
.
LogEntitiesEnum
.
ChangeRequestTemplateStakeHolders
.
value
,
serializers
.
ChangeRequestTemplateAttachmentsSerializer
,
serializers
.
ChangeRequestTemplateStakeHoldersSerializer
,
partial
,
partial
,
self
,
self
,
template_no
template_no
)
)
if
body_data
[
'tmp_attachments'
]:
tmp_add_edit_delete
(
body_data
[
'tmp_attachments'
],
models
.
ChangeRequestTemplateAttachments
,
enums
.
LogEntitiesEnum
.
ChangeRequestTemplateAttachments
.
value
,
serializers
.
ChangeRequestTemplateAttachmentsSerializer
,
partial
,
self
,
template_no
)
if
body_data
[
'tmp_details'
]:
tmp_add_edit_delete
(
tmp_add_edit_delete
(
body_data
[
'tmp_details'
],
body_data
[
'tmp_details'
],
models
.
ChangeRequestTemplateDetails
,
models
.
ChangeRequestTemplateDetails
,
enums
.
LogEntitiesEnum
.
ChangeRequestTemplateDetails
.
value
,
enums
.
LogEntitiesEnum
.
ChangeRequestTemplateDetails
.
value
,
serializers
.
ChangeRequestTemplateDetailsSerializer
,
serializers
.
ChangeRequestTemplateDetailsSerializer
,
partial
,
partial
,
self
,
self
,
template_no
template_no
)
)
serializer
=
self
.
get_serializer
(
instance
)
serializer
=
self
.
get_serializer
(
instance
)
...
@@ -304,7 +301,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
...
@@ -304,7 +301,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
"Unable to edit due to existing transaction"
,
"Unable to edit due to existing transaction"
,
status
=
status
.
HTTP_400_BAD_REQUEST
status
=
status
.
HTTP_400_BAD_REQUEST
)
)
#try
class
ChangeRequestTemplatePost
(
APIView
):
class
ChangeRequestTemplatePost
(
APIView
):
...
...
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