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
bcff2b6b
Commit
bcff2b6b
authored
Oct 14, 2019
by
John Red Medrano
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'RMSv2' of
http://42.61.118.105:7990/scm/rms/api-main-service
into red-develop
parents
e873d05a
a92eb086
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
app/applicationlayer/cms/form/attachment/serializers.py
app/applicationlayer/cms/form/attachment/serializers.py
+4
-2
app/businesslayer/changerequest/change_request.py
app/businesslayer/changerequest/change_request.py
+10
-6
No files found.
app/applicationlayer/cms/form/attachment/serializers.py
View file @
bcff2b6b
...
@@ -40,6 +40,8 @@ class ChangeRequestFormAttachmentsFileUploadSerializer(
...
@@ -40,6 +40,8 @@ class ChangeRequestFormAttachmentsFileUploadSerializer(
'attachment_name'
,
'attachment_name'
,
'file_name'
,
'file_name'
,
'description'
,
'description'
,
'file_upload'
'file_upload'
,
'uploaded_by'
,
'form_code'
)
)
# read_only_fields = ['created', 'code']
# read_only_fields = ['created', 'code']
\ No newline at end of file
app/businesslayer/changerequest/change_request.py
View file @
bcff2b6b
...
@@ -371,17 +371,21 @@ def attachment_add_edit_delete(form_request_body,
...
@@ -371,17 +371,21 @@ def attachment_add_edit_delete(form_request_body,
}
}
data
=
{
**
i
,
**
frm_code
}
data
=
{
**
i
,
**
frm_code
}
old_instance
=
model_to_dict
(
frm_instance
)
if
not
data_old
==
i
:
serializer
=
serializer_data
(
frm_instance
,
serializer
=
serializer_data
(
frm_instance
,
data
=
data
,
data
=
data
,
partial
=
partial
)
partial
=
partial
)
serializer
.
is_valid
(
raise_exception
=
True
)
serializer
.
is_valid
(
raise_exception
=
True
)
old_instance
=
model_to_dict
(
frm_instance
)
if
not
data_old
==
i
:
self
.
perform_update
(
serializer
)
self
.
perform_update
(
serializer
)
new_instance
=
serializer
.
data
new_instance
=
serializer
.
data
# comment
#
print
(
new_instance
)
crhistory_save
(
crhistory_save
(
batch_no
,
batch_no
,
main_action
,
main_action
,
...
...
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