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
c73650bc
Commit
c73650bc
authored
Oct 02, 2019
by
John Red Medrano
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #250 in RMS/api-main-service from red-develop to RMSv2
* commit '
9662ca9c
': fixing the company selection on cr
parents
d57996e9
9662ca9c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/applicationlayer/cms/master/form/company/views.py
app/applicationlayer/cms/master/form/company/views.py
+1
-1
app/applicationlayer/cms/master/form/department/views.py
app/applicationlayer/cms/master/form/department/views.py
+1
-1
No files found.
app/applicationlayer/cms/master/form/company/views.py
View file @
c73650bc
...
...
@@ -29,7 +29,7 @@ class ChangeRequestCompanyFormViewSet(viewsets.ModelViewSet):
queryset
=
self
.
filter_queryset
(
self
.
get_queryset
())
allowed
=
AllowedCompany
.
objects
.
filter
(
Q
(
id_number
=
self
.
request
.
user
.
code
)
&
Q
(
create_change_request
_template
=
True
)
Q
(
create_change_request
=
True
)
)
.
values
(
'company_pivot'
)
queryset
=
queryset
.
filter
(
code__in
=
allowed
)
page
=
self
.
paginate_queryset
(
queryset
)
...
...
app/applicationlayer/cms/master/form/department/views.py
View file @
c73650bc
...
...
@@ -35,7 +35,7 @@ class ChangeRequestDepartmentFormViewSet(viewsets.ModelViewSet):
allowed
=
AllowedCompany
.
objects
.
filter
(
Q
(
id_number
=
self
.
request
.
user
.
code
)
&
Q
(
company_pivot
=
company
)
&
Q
(
create_change_request
_template
=
True
)
Q
(
create_change_request
=
True
)
)
.
values
(
'group_pivots'
)
queryset
=
queryset
.
filter
(
code__in
=
allowed
)
page
=
self
.
paginate_queryset
(
queryset
)
...
...
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