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
37a88913
Commit
37a88913
authored
Oct 10, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
archive form
parent
395e14bf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
25 deletions
+39
-25
app/applicationlayer/cms/form/attachment/serializers.py
app/applicationlayer/cms/form/attachment/serializers.py
+21
-21
app/applicationlayer/cms/form/header/serializers.py
app/applicationlayer/cms/form/header/serializers.py
+10
-1
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+8
-3
No files found.
app/applicationlayer/cms/form/attachment/serializers.py
View file @
37a88913
...
...
@@ -7,27 +7,27 @@ class ChangeRequestFormAttachmentsSerializer(
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
ret
[
'file_upload'
]
=
self
.
context
[
'request'
]
.
build_absolute_uri
(
instance
.
file_upload
.
url
.
url
)
ret
[
'file_upload_id'
]
=
self
.
context
[
'request'
]
.
build_absolute_uri
(
instance
.
file_upload
.
id
)
return
ret
#
except Exception as e:
#
ret['uploaded_by'] = user_object
#
ret['file_upload'] = "none"
#
return ret
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
ret
[
'file_upload'
]
=
self
.
context
[
'request'
]
.
build_absolute_uri
(
instance
.
file_upload
.
url
.
url
)
ret
[
'file_upload_id'
]
=
self
.
context
[
'request'
]
.
build_absolute_uri
(
instance
.
file_upload
.
url
)
return
ret
except
Exception
as
e
:
ret
[
'uploaded_by'
]
=
user_object
ret
[
'file_upload'
]
=
"none"
return
ret
class
Meta
:
model
=
models
.
ChangeRequestFormAttachments
...
...
app/applicationlayer/cms/form/header/serializers.py
View file @
37a88913
...
...
@@ -133,7 +133,16 @@ class ChangeRequestFormHeaderSerializerList(
ret
[
'company'
]
=
instance
.
requested_to_company
.
name
ret
[
'department'
]
=
instance
.
requested_to_department
.
name
ret
[
'requested_by'
]
=
instance
.
requested_by_user
.
name
if
instance
.
status
.
lower
()
==
'draft'
:
can_delete
=
True
elif
instance
.
status
.
lower
()
==
'cancelled'
or
instance
.
status
.
lower
()
==
'closed'
:
can_delete
=
False
else
:
can_delete
=
'None'
ret
[
'can_delete'
]
=
can_delete
return
ret
except
Exception
as
e
:
ret
[
'action_required'
]
=
"No"
...
...
app/applicationlayer/cms/form/header/views.py
View file @
37a88913
...
...
@@ -437,11 +437,16 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
status
=
status
.
HTTP_200_OK
)
else
:
models
.
ChangeRequestFormHeader
.
objects
.
filter
(
form_code
=
form_code
)
.
update
(
is_active
=
False
)
return
Response
(
{
"message"
:
"
Change request cannot be deleted due to previous transaction/s
"
},
status
=
status
.
HTTP_
400_BAD_REQUEST
)
{
"message"
:
"
Draft change request sucessfully archived
"
},
status
=
status
.
HTTP_
200_OK
)
elif
current_status
.
status
.
lower
()
==
'cancelled'
:
elif
current_status
.
status
.
lower
()
==
'cancelled'
or
current_status
.
status
.
lower
()
==
'closed'
:
models
.
ChangeRequestFormHeader
.
objects
.
filter
(
form_code
=
form_code
...
...
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