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
b8b9b93c
Commit
b8b9b93c
authored
Feb 21, 2020
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
{dev bugfix} users download fix
parent
f6df2074
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
7 deletions
+3
-7
app/applicationlayer/master/download/accounts/views.py
app/applicationlayer/master/download/accounts/views.py
+3
-7
No files found.
app/applicationlayer/master/download/accounts/views.py
View file @
b8b9b93c
...
@@ -5,13 +5,11 @@ from drf_renderer_xlsx.renderers import XLSXRenderer
...
@@ -5,13 +5,11 @@ from drf_renderer_xlsx.renderers import XLSXRenderer
from
app.entities.models
import
(
from
app.entities.models
import
(
User
User
)
)
# from app.applicationlayer.form_listing_ import headers
from
app.applicationlayer.master.download.accounts.serializers
import
headers
from
app.applicationlayer.master.download.accounts.serializers
import
headers
from
django.db.models
import
CharField
,
Value
from
django.db.models
import
CharField
,
Value
from
django.db.models
import
Q
from
django.db.models
import
Q
from
rest_framework.response
import
Response
from
rest_framework.response
import
Response
from
rest_framework.permissions
import
AllowAny
from
rest_framework.permissions
import
AllowAny
# from cms.applicationlayer.utilities import logged_user
from
rest_framework.exceptions
import
ParseError
from
rest_framework.exceptions
import
ParseError
from
rest_framework
import
status
from
rest_framework
import
status
...
@@ -26,15 +24,13 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
...
@@ -26,15 +24,13 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
user_type
=
self
.
request
.
user
.
user_type
user_type
=
self
.
request
.
user
.
user_type
company
=
self
.
request
.
user
.
department
.
company
company
=
self
.
request
.
user
.
department
.
company
.
code
department
=
self
.
request
.
user
.
department
department
=
self
.
request
.
user
.
department
.
code
if
user_type
==
'CUA'
:
if
user_type
==
'CUA'
:
# code = data.values_list('department__company', flat=True)[0]
data
=
User
.
objects
.
filter
(
data
=
User
.
objects
.
filter
(
department__company
=
company
)
.
exclude
(
id
=
1
)
department__company
=
company
)
.
exclude
(
id
=
1
)
elif
user_type
==
'DUA'
:
elif
user_type
==
'DUA'
:
# code = data.values_list('department', flat=True)[0]
data
=
User
.
objects
.
filter
(
data
=
User
.
objects
.
filter
(
department
=
department
)
.
exclude
(
id
=
1
)
department
=
department
)
.
exclude
(
id
=
1
)
elif
user_type
==
'SU'
:
elif
user_type
==
'SU'
:
...
...
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