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
8ba82045
Commit
8ba82045
authored
Oct 10, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adjust draft archived
parent
f471bae8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
app/applicationlayer/cms/form/header/serializers.py
app/applicationlayer/cms/form/header/serializers.py
+9
-2
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+1
-1
No files found.
app/applicationlayer/cms/form/header/serializers.py
View file @
8ba82045
...
...
@@ -135,8 +135,15 @@ class ChangeRequestFormHeaderSerializerList(
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'
:
existing_transaction
=
models
.
ChangeRequestHistory
.
objects
.
filter
(
form_code
=
instance
.
form_code
)
if
existing_transaction
.
count
()
>
0
:
can_delete
=
False
else
:
can_delete
=
True
# hard delete
elif
instance
.
status
.
lower
()
==
'cancelled'
:
can_delete
=
False
else
:
can_delete
=
None
...
...
app/applicationlayer/cms/form/header/views.py
View file @
8ba82045
...
...
@@ -446,7 +446,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
{
"message"
:
"Draft change request sucessfully archived"
},
status
=
status
.
HTTP_200_OK
)
elif
current_status
.
status
.
lower
()
==
'cancelled'
or
current_status
.
status
.
lower
()
==
'closed'
:
elif
current_status
.
status
.
lower
()
==
'cancelled'
:
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