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
89251c10
Commit
89251c10
authored
Oct 14, 2019
by
John Red Medrano
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #374 in RMS/api-main-service from red-develop to RMSv2
* commit '
71ccaf98
': fixing
parents
e3d6fda3
71ccaf98
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
4 deletions
+22
-4
app/applicationlayer/cms/form/download/views.py
app/applicationlayer/cms/form/download/views.py
+22
-4
No files found.
app/applicationlayer/cms/form/download/views.py
View file @
89251c10
...
...
@@ -5,7 +5,8 @@ from drf_renderer_xlsx.renderers import XLSXRenderer
from
app.entities.models
import
(
ChangeRequestFormHeader
,
ChangeRequestFormApprovers
,
ChangeRequestFormStakeHolders
ChangeRequestFormStakeHolders
,
AllowedCompany
)
# from app.applicationlayer.form_listing_ import headers
from
app.applicationlayer.cms.form.download.serializers
import
headers
...
...
@@ -25,10 +26,27 @@ class DownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
id_number
=
request
.
user
.
code
data
=
ChangeRequestFormHeader
.
objects
.
filter
(
Q
(
frm_approvers__user__code
=
id_number
)
|
# data = ChangeRequestFormHeader.objects.filter(
# Q(frm_approvers__user__code=id_number) |
# Q(requested_by_user=id_number) |
# Q(frm_stakes__user__code=id_number)
# ).distinct()
priviledgeCrs
=
models
.
AllowedCompany
.
objects
.
filter
(
Q
(
id_number
=
id_number
)
&
Q
(
view_all_change_request
=
True
)
)
.
values
(
'group_pivots'
)
data
=
models
.
ChangeRequestFormHeader
.
objects
.
filter
(
(
Q
(
frm_approvers__user__code
=
id_number
)
|
Q
(
frm_stakes__user__code
=
id_number
)
|
Q
(
requested_by_user
=
id_number
)
|
Q
(
frm_stakes__user__code
=
id_number
)
Q
(
requested_to_department__in
=
priviledgeCrs
))
&
Q
(
is_active
=
True
)
)
.
exclude
(
Q
(
status__icontains
=
'Draft'
)
&
~
Q
(
requested_by_user
=
id_number
)
)
.
distinct
()
serializer
=
headers
(
data
=
data
,
many
=
True
,
context
=
{
'request'
:
request
})
...
...
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