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
09473cec
Commit
09473cec
authored
Sep 27, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update add_update
parent
9a248fb7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
59 additions
and
6 deletions
+59
-6
app/applicationlayer/cms/form/views.py
app/applicationlayer/cms/form/views.py
+1
-1
app/applicationlayer/cms/template/attachment/serializers.py
app/applicationlayer/cms/template/attachment/serializers.py
+18
-0
app/applicationlayer/cms/template/header/serializers.py
app/applicationlayer/cms/template/header/serializers.py
+18
-0
app/businesslayer/changerequest/change_request.py
app/businesslayer/changerequest/change_request.py
+11
-2
app/businesslayer/changerequest/change_request_template.py
app/businesslayer/changerequest/change_request_template.py
+11
-3
No files found.
app/applicationlayer/cms/form/views.py
View file @
09473cec
...
@@ -851,7 +851,7 @@ class ChangeRequestFormApproversViewset(meviewsets.ModelViewSet):
...
@@ -851,7 +851,7 @@ class ChangeRequestFormApproversViewset(meviewsets.ModelViewSet):
serializer_class
=
serializers
.
ChangeRequestFormApproversSerializer
serializer_class
=
serializers
.
ChangeRequestFormApproversSerializer
pagination_class
=
paginators
.
SimplePageNumberPagination
pagination_class
=
paginators
.
SimplePageNumberPagination
lookup_field
=
'code'
lookup_field
=
'code'
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
self
.
queryset
=
QuerySetHelper
.
Sort
(
self
)
self
.
queryset
=
QuerySetHelper
.
Sort
(
self
)
return
super
(
ChangeRequestFormApproversViewset
,
self
)
.
list
(
request
)
return
super
(
ChangeRequestFormApproversViewset
,
self
)
.
list
(
request
)
...
...
app/applicationlayer/cms/template/attachment/serializers.py
View file @
09473cec
...
@@ -6,6 +6,24 @@ from django.forms.models import model_to_dict
...
@@ -6,6 +6,24 @@ from django.forms.models import model_to_dict
class
ChangeRequestTemplateAttachmentsSerializer
(
class
ChangeRequestTemplateAttachmentsSerializer
(
serializers
.
ModelSerializer
serializers
.
ModelSerializer
):
):
def
to_representation
(
self
,
instance
):
try
:
ret
=
super
()
.
to_representation
(
instance
)
user_object
=
{
"id"
:
instance
.
uploaded_by
.
id
,
"name"
:
instance
.
uploaded_by
.
name
,
"username"
:
instance
.
uploaded_by
.
username
,
"code"
:
instance
.
uploaded_by
.
code
,
"email"
:
instance
.
uploaded_by
.
email
,
"contact_no"
:
instance
.
uploaded_by
.
contact_no
}
ret
[
'uploaded_by'
]
=
user_object
return
ret
except
Exception
as
e
:
ret
[
'uploaded_by'
]
=
"none"
return
ret
class
Meta
:
class
Meta
:
model
=
models
.
ChangeRequestTemplateAttachments
model
=
models
.
ChangeRequestTemplateAttachments
fields
=
'__all__'
fields
=
'__all__'
...
...
app/applicationlayer/cms/template/header/serializers.py
View file @
09473cec
...
@@ -15,6 +15,24 @@ from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequ
...
@@ -15,6 +15,24 @@ from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequ
class
ChangeRequestTemplateAttachmentsSerializer
(
class
ChangeRequestTemplateAttachmentsSerializer
(
serializers
.
ModelSerializer
serializers
.
ModelSerializer
):
):
def
to_representation
(
self
,
instance
):
try
:
ret
=
super
()
.
to_representation
(
instance
)
user_object
=
{
"id"
:
instance
.
uploaded_by
.
id
,
"name"
:
instance
.
uploaded_by
.
name
,
"username"
:
instance
.
uploaded_by
.
username
,
"code"
:
instance
.
uploaded_by
.
code
,
"email"
:
instance
.
uploaded_by
.
email
,
"contact_no"
:
instance
.
uploaded_by
.
contact_no
}
ret
[
'uploaded_by'
]
=
user_object
return
ret
except
Exception
as
e
:
ret
[
'uploaded_by'
]
=
"none"
return
ret
class
Meta
:
class
Meta
:
model
=
models
.
ChangeRequestTemplateAttachments
model
=
models
.
ChangeRequestTemplateAttachments
fields
=
'__all__'
fields
=
'__all__'
...
...
app/businesslayer/changerequest/change_request.py
View file @
09473cec
...
@@ -288,8 +288,13 @@ def form_add_edit_delete(form_request_body,
...
@@ -288,8 +288,13 @@ def form_add_edit_delete(form_request_body,
pk
=
i
[
'id'
]
pk
=
i
[
'id'
]
)
)
frm_code
=
{
"form_code"
:
form_code
}
data
=
{
**
i
,
**
frm_code
}
serializer
=
serializer_data
(
frm_instance
,
serializer
=
serializer_data
(
frm_instance
,
data
=
i
,
data
=
data
,
partial
=
partial
)
partial
=
partial
)
serializer
.
is_valid
(
raise_exception
=
True
)
serializer
.
is_valid
(
raise_exception
=
True
)
...
@@ -309,7 +314,11 @@ def form_add_edit_delete(form_request_body,
...
@@ -309,7 +314,11 @@ def form_add_edit_delete(form_request_body,
)
)
else
:
else
:
serializer
=
serializer_data
(
data
=
i
)
frm_code
=
{
"form_code"
:
form_code
}
data
=
{
**
i
,
**
frm_code
}
serializer
=
serializer_data
(
data
=
data
)
serializer
.
is_valid
(
raise_exception
=
True
)
serializer
.
is_valid
(
raise_exception
=
True
)
self
.
perform_create
(
serializer
)
self
.
perform_create
(
serializer
)
...
...
app/businesslayer/changerequest/change_request_template.py
View file @
09473cec
...
@@ -51,9 +51,13 @@ def tmp_add_edit_delete(tmp_request_body,
...
@@ -51,9 +51,13 @@ def tmp_add_edit_delete(tmp_request_body,
tmp_instance
=
queryset
.
objects
.
get
(
tmp_instance
=
queryset
.
objects
.
get
(
pk
=
i
[
'id'
]
pk
=
i
[
'id'
]
)
)
tmp_code
=
{
"template_no"
:
template_no
}
data
=
{
**
i
,
**
tmp_code
}
serializer
=
serializer_data
(
tmp_instance
,
serializer
=
serializer_data
(
tmp_instance
,
data
=
i
,
data
=
data
,
partial
=
partial
)
partial
=
partial
)
serializer
.
is_valid
(
raise_exception
=
True
)
serializer
.
is_valid
(
raise_exception
=
True
)
...
@@ -70,7 +74,11 @@ def tmp_add_edit_delete(tmp_request_body,
...
@@ -70,7 +74,11 @@ def tmp_add_edit_delete(tmp_request_body,
new_instance
new_instance
)
)
else
:
else
:
serializer
=
serializer_data
(
data
=
i
)
tmp_code
=
{
"template_no"
:
template_no
}
data
=
{
**
i
,
**
tmp_code
}
serializer
=
serializer_data
(
data
=
data
)
serializer
.
is_valid
(
raise_exception
=
True
)
serializer
.
is_valid
(
raise_exception
=
True
)
self
.
perform_create
(
serializer
)
self
.
perform_create
(
serializer
)
...
...
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