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
a3cb719a
Commit
a3cb719a
authored
Sep 25, 2019
by
John Red Medrano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed admin in all department list
parent
7020184d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
app/applicationlayer/management/module/views.py
app/applicationlayer/management/module/views.py
+1
-0
app/applicationlayer/master/Account/views.py
app/applicationlayer/master/Account/views.py
+6
-6
app/applicationlayer/master/department/views.py
app/applicationlayer/master/department/views.py
+1
-0
No files found.
app/applicationlayer/management/module/views.py
View file @
a3cb719a
...
...
@@ -64,6 +64,7 @@ class ModuleViewSet(viewsets.ModelViewSet):
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
queryset
=
self
.
filter_queryset
(
self
.
get_queryset
())
queryset
=
queryset
.
exclude
(
id
=
1
)
page
=
self
.
paginate_queryset
(
queryset
)
if
page
is
not
None
:
...
...
app/applicationlayer/master/Account/views.py
View file @
a3cb719a
...
...
@@ -30,7 +30,7 @@ class AdminAccountViewSet(viewsets.ModelViewSet):
# @rms.department_list
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
#
try:
try
:
queryset
=
self
.
filter_queryset
(
self
.
get_queryset
())
if
len
(
self
.
request
.
query_params
)
>
0
:
...
...
@@ -56,8 +56,8 @@ class AdminAccountViewSet(viewsets.ModelViewSet):
serializer
=
self
.
get_serializer
(
queryset
,
many
=
True
)
return
Response
(
serializer
.
data
)
#
except Exception as e:
#
return Response(
#
{'message': "query params department_code and company_code are both expected"},
#
status=status.HTTP_400_BAD_REQUEST
#
)
except
Exception
as
e
:
return
Response
(
{
'message'
:
"query params department_code and company_code are both expected"
},
status
=
status
.
HTTP_400_BAD_REQUEST
)
app/applicationlayer/master/department/views.py
View file @
a3cb719a
...
...
@@ -30,6 +30,7 @@ class AdminDepartmentViewSet(viewsets.ModelViewSet):
company
=
self
.
request
.
query_params
[
'company_code'
]
queryset
=
self
.
filter_queryset
(
self
.
get_queryset
())
queryset
=
queryset
.
filter
(
company__code
=
company
)
queryset
=
queryset
.
exclude
(
id
=
1
)
page
=
self
.
paginate_queryset
(
queryset
)
if
page
is
not
None
:
...
...
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