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
569c4a9b
Commit
569c4a9b
authored
Sep 13, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update requirements
parent
71f557a9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
141 additions
and
17 deletions
+141
-17
app/applicationlayer/cms/form/views.py
app/applicationlayer/cms/form/views.py
+75
-1
app/entities/migrations/0010_auto_20190913_1143.py
app/entities/migrations/0010_auto_20190913_1143.py
+33
-0
app/entities/models.py
app/entities/models.py
+32
-16
requirements/local.txt
requirements/local.txt
+1
-0
No files found.
app/applicationlayer/cms/form/views.py
View file @
569c4a9b
...
...
@@ -314,7 +314,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# re create approvers
approvers
=
models
.
ChangeRequestFormApprovers
.
objects
.
filter
(
form_code
=
form_code
)
counter
=
0
for
approver
in
approvers
:
...
...
@@ -363,11 +363,85 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
pk
=
to_delete
)
.
delete
()
# re create details
details
=
models
.
ChangeRequestFormDetails
.
objects
.
filter
(
form_code
=
form_code
)
counter
=
0
for
detail
in
details
:
to_delete
=
detail
.
pk
counter
=
counter
+
1
detail
.
pk
=
None
detail
.
code
=
counter
detail
.
save
()
new_frmdetail_code
=
number_generator
(
enums
.
GenerateCode
.
FORM_DETAIL
.
value
,
detail
.
id
)
models
.
ChangeRequestFormDetails
.
objects
.
filter
(
pk
=
detail
.
id
)
.
update
(
code
=
new_frmdetail_code
,
form_code
=
new_frmheader_code
)
# delete old data
models
.
ChangeRequestFormDetails
.
objects
.
filter
(
pk
=
to_delete
)
.
delete
()
# re create attachments
attachments
=
models
.
ChangeRequestFormAttachments
.
objects
.
filter
(
form_code
=
form_code
)
counter
=
0
for
attachment
in
attachments
:
to_delete
=
attachment
.
pk
counter
=
counter
+
1
attachment
.
pk
=
None
attachment
.
code
=
counter
attachment
.
save
()
new_frmattach_code
=
number_generator
(
enums
.
GenerateCode
.
FORM_ATTACH
.
value
,
attachment
.
id
)
models
.
ChangeRequestFormAttachments
.
objects
.
filter
(
pk
=
attachment
.
id
)
.
update
(
code
=
new_frmattach_code
,
form_code
=
new_frmheader_code
)
# delete old data
models
.
ChangeRequestFormAttachments
.
objects
.
filter
(
pk
=
to_delete
)
.
delete
()
# delete old data form header
models
.
ChangeRequestFormHeader
.
objects
.
filter
(
form_code
=
form_code
)
.
delete
()
return
Response
(
"Change request form successfully resubmitted"
,
status
=
status
.
HTTP_200_OK
)
# actions
@
action
(
methods
=
[
'PATCH'
],
detail
=
True
,
url_path
=
'actions'
,
url_name
=
'actions'
)
def
actions
(
self
,
request
,
*
args
,
**
kwargs
):
form_code
=
kwargs
[
'form_code'
]
print
(
form_code
)
models
.
ChangeRequestFormHeader
.
objects
.
filter
(
form_code
=
form_code
)
.
update
(
status
=
'Pending'
)
models
.
ChangeRequestFormApprovers
.
objects
.
filter
(
form_code
=
form_code
)
.
update
(
action
=
None
,
remarks
=
None
,
date_sent
=
None
)
return
Response
(
"Change request form successfully re routed"
,
status
=
status
.
HTTP_200_OK
)
class
ChangeRequestFormApproversViewset
(
meviewsets
.
ModelViewSet
):
...
...
app/entities/migrations/0010_auto_20190913_1143.py
0 → 100644
View file @
569c4a9b
# Generated by Django 2.2 on 2019-09-13 11:43
from
django.db
import
migrations
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'entities'
,
'0009_auto_20190911_1845'
),
]
operations
=
[
migrations
.
RemoveField
(
model_name
=
'changerequestformapprovers'
,
name
=
'archived_at'
,
),
migrations
.
RemoveField
(
model_name
=
'changerequestformattachments'
,
name
=
'archived_at'
,
),
migrations
.
RemoveField
(
model_name
=
'changerequestformdetails'
,
name
=
'archived_at'
,
),
migrations
.
RemoveField
(
model_name
=
'changerequestformheader'
,
name
=
'archived_at'
,
),
migrations
.
RemoveField
(
model_name
=
'changerequestformstakeholders'
,
name
=
'archived_at'
,
),
]
app/entities/models.py
View file @
569c4a9b
...
...
@@ -373,10 +373,6 @@ class BaseHeader(models.Model):
created
=
models
.
DateTimeField
(
auto_now_add
=
True
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
abstract
=
True
...
...
@@ -398,9 +394,6 @@ class BaseApprover(models.Model):
created
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
abstract
=
True
...
...
@@ -420,9 +413,6 @@ class BaseStakeholder(models.Model):
created
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
abstract
=
True
...
...
@@ -451,9 +441,6 @@ class BaseAttachment(models.Model):
created
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
abstract
=
True
...
...
@@ -468,9 +455,6 @@ class BaseDetails(models.Model):
created
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
abstract
=
True
...
...
@@ -503,6 +487,10 @@ class ChangeRequestTemplateHeader(BaseHeader):
to_field
=
'code'
,
related_name
=
'created_by_department'
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
db_table
=
'change_request_template_headers'
...
...
@@ -531,6 +519,9 @@ class ChangeRequestTemplateApprovers(BaseApprover):
on_delete
=
models
.
DO_NOTHING
,
to_field
=
'template_no'
,
related_name
=
'tmp_approvers'
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
db_table
=
'change_request_template_approvers'
...
...
@@ -547,6 +538,10 @@ class ChangeRequestTemplateApprovers(BaseApprover):
self
.
created
=
datetime
.
now
()
self
.
save
()
def
delete
(
self
):
self
.
archived_at
=
datetime
.
utcnow
self
.
save
()
class
ChangeRequestTemplateStakeHolders
(
BaseStakeholder
):
code
=
models
.
CharField
(
unique
=
True
,
...
...
@@ -556,6 +551,9 @@ class ChangeRequestTemplateStakeHolders(BaseStakeholder):
on_delete
=
models
.
DO_NOTHING
,
to_field
=
'template_no'
,
related_name
=
'tmp_stakes'
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
db_table
=
'change_request_template_stakeholders'
...
...
@@ -571,6 +569,10 @@ class ChangeRequestTemplateStakeHolders(BaseStakeholder):
self
.
code
=
code
self
.
created
=
datetime
.
now
()
self
.
save
()
def
delete
(
self
):
self
.
archived_at
=
datetime
.
utcnow
self
.
save
()
class
ChangeRequestTemplateAttachments
(
BaseAttachment
):
...
...
@@ -582,6 +584,9 @@ class ChangeRequestTemplateAttachments(BaseAttachment):
on_delete
=
models
.
DO_NOTHING
,
to_field
=
'template_no'
,
related_name
=
'tmp_attachments'
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
db_table
=
'change_request_template_attachments'
...
...
@@ -597,6 +602,10 @@ class ChangeRequestTemplateAttachments(BaseAttachment):
self
.
code
=
code
self
.
created
=
datetime
.
now
()
self
.
save
()
def
delete
(
self
):
self
.
archived_at
=
datetime
.
utcnow
self
.
save
()
class
ChangeRequestTemplateDetails
(
BaseDetails
):
...
...
@@ -608,6 +617,9 @@ class ChangeRequestTemplateDetails(BaseDetails):
on_delete
=
models
.
DO_NOTHING
,
to_field
=
'template_no'
,
related_name
=
'tmp_details'
)
archived_at
=
models
.
DateTimeField
(
blank
=
True
,
null
=
True
)
class
Meta
:
db_table
=
'change_request_template_details'
...
...
@@ -623,6 +635,10 @@ class ChangeRequestTemplateDetails(BaseDetails):
self
.
code
=
code
self
.
created
=
datetime
.
now
()
self
.
save
()
def
delete
(
self
):
self
.
archived_at
=
datetime
.
utcnow
self
.
save
()
'''
*****
...
...
requirements/local.txt
View file @
569c4a9b
...
...
@@ -19,6 +19,7 @@ Django==2.2
django-cors-headers==2.5.2
django-filter==2.1.0
djangorestframework==3.9.2
drf-writable-nested==0.5.1
gevent==1.4.0
greenlet==0.4.15
hiredis==1.0.0
...
...
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