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
6f54cdd6
Commit
6f54cdd6
authored
Feb 06, 2020
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
{dev bugfix} remove fields in model (company_desc, requested_desc, department_desc)
parent
b2415852
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
47 additions
and
22 deletions
+47
-22
app/applicationlayer/cms/form/header/serializers.py
app/applicationlayer/cms/form/header/serializers.py
+1
-1
app/applicationlayer/cms/form/header/views.py
app/applicationlayer/cms/form/header/views.py
+4
-4
app/applicationlayer/cms/form/serializers.py
app/applicationlayer/cms/form/serializers.py
+1
-2
app/applicationlayer/cms/form/views.py
app/applicationlayer/cms/form/views.py
+4
-3
app/entities/migrations/0003_auto_20200206_1422.py
app/entities/migrations/0003_auto_20200206_1422.py
+25
-0
app/entities/models.py
app/entities/models.py
+12
-12
No files found.
app/applicationlayer/cms/form/header/serializers.py
View file @
6f54cdd6
...
...
@@ -98,7 +98,7 @@ class ChangeRequestFormHeaderSerializer(
ret
[
'template_object'
]
=
"None"
return
ret
# 'company_desc', 'department_desc', 'requested_desc',
class
Meta
:
model
=
models
.
ChangeRequestFormHeader
# fields = '__all__'
...
...
app/applicationlayer/cms/form/header/views.py
View file @
6f54cdd6
...
...
@@ -1196,7 +1196,6 @@ class ChangeRequestFormPost(APIView):
def
post
(
self
,
request
):
form_header
=
request
.
data
# comment
try
:
data_list_approver
=
[]
data_list_stake
=
[]
...
...
@@ -1211,9 +1210,6 @@ class ChangeRequestFormPost(APIView):
'requested_to_priority'
:
form_header
[
'requested_to_priority'
],
'description'
:
form_header
[
'description'
],
'status'
:
form_header
[
'status'
],
'company_desc'
:
None
,
'department_desc'
:
None
,
'requested_desc'
:
None
,
'requested_by_department'
:
form_header
[
'requested_by_department'
],
'requested_by_user'
:
form_header
[
'requested_by_user'
],
'requested_to_company'
:
form_header
[
'requested_to_company'
],
...
...
@@ -1221,6 +1217,10 @@ class ChangeRequestFormPost(APIView):
'requested_to_user'
:
form_header
[
'requested_to_user'
],
'template_no'
:
form_header
[
'template_no'
]
}
# 'company_desc': None,
# 'department_desc': None,
# 'requested_desc': None,
sp1
=
transaction
.
savepoint
()
# nothing will save to db
...
...
app/applicationlayer/cms/form/serializers.py
View file @
6f54cdd6
...
...
@@ -118,7 +118,6 @@ class ChangeRequestFormHeaderSerializer(
fields
=
(
'form_code'
,
'requested_to_template_name'
,
'requested_to_objective'
,
'requested_to_target_date'
,
'requested_to_priority'
,
'description'
,
'created'
,
'cancel_date'
,
'status'
,
'company_desc'
,
'department_desc'
,
'requested_desc'
,
'requested_to_template_id'
,
'requested_to_company'
,
'requested_to_department'
,
'requested_to_user'
,
'requested_by_user'
,
'requested_by_department'
,
...
...
@@ -127,7 +126,7 @@ class ChangeRequestFormHeaderSerializer(
read_only_fields
=
[
'created'
,
'form_code'
]
# 'company_desc', 'department_desc', 'requested_desc',
class
ChangeRequestFormHeaderSerializerList
(
serializers
.
ModelSerializer
):
...
...
app/applicationlayer/cms/form/views.py
View file @
6f54cdd6
...
...
@@ -941,9 +941,6 @@ class ChangeRequestFormPost(APIView):
'requested_to_priority'
:
form_header
[
'requested_to_priority'
],
'description'
:
form_header
[
'description'
],
'status'
:
form_header
[
'status'
],
'company_desc'
:
form_header
[
'company_desc'
],
'department_desc'
:
form_header
[
'department_desc'
],
'requested_desc'
:
form_header
[
'requested_desc'
],
'requested_by_department'
:
form_header
[
'requested_by_department'
],
'requested_by_user'
:
form_header
[
'requested_by_user'
],
'requested_to_company'
:
form_header
[
'requested_to_company'
],
...
...
@@ -952,6 +949,10 @@ class ChangeRequestFormPost(APIView):
'template_no'
:
form_header
[
'template_no'
]
}
# 'company_desc': form_header['company_desc'],
# 'department_desc': form_header['department_desc'],
# 'requested_desc': form_header['requested_desc'],
sp1
=
transaction
.
savepoint
()
# nothing will save to db
serializer
=
serializers
.
ChangeRequestFormHeaderSerializer
(
...
...
app/entities/migrations/0003_auto_20200206_1422.py
0 → 100644
View file @
6f54cdd6
# Generated by Django 2.2 on 2020-02-06 14:22
from
django.db
import
migrations
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'entities'
,
'0002_auto_20200205_1707'
),
]
operations
=
[
migrations
.
RemoveField
(
model_name
=
'changerequestformheader'
,
name
=
'company_desc'
,
),
migrations
.
RemoveField
(
model_name
=
'changerequestformheader'
,
name
=
'department_desc'
,
),
migrations
.
RemoveField
(
model_name
=
'changerequestformheader'
,
name
=
'requested_desc'
,
),
]
app/entities/models.py
View file @
6f54cdd6
...
...
@@ -784,18 +784,6 @@ class ChangeRequestFormHeader(BaseHeader):
on_delete
=
models
.
PROTECT
,
to_field
=
'template_no'
)
status
=
models
.
CharField
(
max_length
=
50
)
company_desc
=
models
.
CharField
(
max_length
=
255
,
null
=
True
,
blank
=
True
)
department_desc
=
models
.
CharField
(
max_length
=
255
,
null
=
True
,
blank
=
True
)
requested_desc
=
models
.
CharField
(
max_length
=
255
,
null
=
True
,
blank
=
True
)
requested_to_template_id
=
models
.
CharField
(
max_length
=
255
)
requested_to_target_date
=
models
.
DateTimeField
(
...
...
@@ -817,6 +805,18 @@ class ChangeRequestFormHeader(BaseHeader):
self
.
form_code
=
code
self
.
save
()
# company_desc = models.CharField(
# max_length=255,
# null=True,
# blank=True)
# department_desc = models.CharField(
# max_length=255,
# null=True,
# blank=True)
# requested_desc = models.CharField(
# max_length=255,
# null=True,
# blank=True)
class
ChangeRequestFormApprovers
(
BaseApprover
):
code
=
models
.
CharField
(
...
...
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