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
d42db6ac
Commit
d42db6ac
authored
Sep 16, 2019
by
John Red Medrano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
untrack changes
parent
f78354cc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
9 deletions
+8
-9
app/applicationlayer/management/account/serializer.py
app/applicationlayer/management/account/serializer.py
+0
-8
app/applicationlayer/master/department/serializer.py
app/applicationlayer/master/department/serializer.py
+7
-0
app/entities/models.py
app/entities/models.py
+1
-1
No files found.
app/applicationlayer/management/account/serializer.py
View file @
d42db6ac
...
...
@@ -11,14 +11,6 @@ class UserSerializer(serializers.ModelSerializer):
def
to_representation
(
self
,
instance
):
# department = Department.objects.filter(
# id=instance.company.id
# ).values().first()
# company_name = Department.objects.filter(
# id=instance.company.id
# ).values().first()
ret
=
super
()
.
to_representation
(
instance
)
ret
[
'department'
]
=
model_to_dict
(
instance
.
department
)
ret
[
'company'
]
=
model_to_dict
(
instance
.
department
.
company
)
...
...
app/applicationlayer/master/department/serializer.py
View file @
d42db6ac
from
rest_framework
import
serializers
from
app.entities.models
import
Department
from
django.forms.models
import
model_to_dict
class
AdminDepartmentSerializer
(
serializers
.
ModelSerializer
):
def
to_representation
(
self
,
instance
):
ret
=
super
()
.
to_representation
(
instance
)
ret
[
'company'
]
=
model_to_dict
(
instance
.
company
)
return
ret
class
Meta
:
model
=
Department
fields
=
'__all__'
...
...
app/entities/models.py
View file @
d42db6ac
...
...
@@ -668,7 +668,7 @@ class ChangeRequestFormHeader(BaseHeader):
on_delete
=
models
.
DO_NOTHING
,
to_field
=
'template_no'
)
status
=
models
.
CharField
(
max_length
=
50
)
company_desc
=
models
.
CharField
(
max_length
=
255
,
null
=
True
,
...
...
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