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
08cb5ab7
Commit
08cb5ab7
authored
May 31, 2019
by
John Red Medrano
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #27 in RMS/api-main-service from red-develop to dev
* commit '
5f374d54
': bug fixing
parents
5facf2ab
5f374d54
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
api/viewsets/applications.py
api/viewsets/applications.py
+2
-2
config/settings/local.py
config/settings/local.py
+1
-1
No files found.
api/viewsets/applications.py
View file @
08cb5ab7
...
@@ -9,7 +9,7 @@ from api.utils import (CustomPagination, BadRequestException,
...
@@ -9,7 +9,7 @@ from api.utils import (CustomPagination, BadRequestException,
status_message_response
)
status_message_response
)
A
CCOUNT_GROUP
=
settings
.
ACCOUNT
_GROUP
A
UTHENTICATOR_GROUP
=
settings
.
AUTHENTICATOR
_GROUP
class
ApplicationViewSet
(
viewsets
.
ModelViewSet
):
class
ApplicationViewSet
(
viewsets
.
ModelViewSet
):
...
@@ -68,7 +68,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
...
@@ -68,7 +68,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
results
=
[]
results
=
[]
for
item
in
serializer
.
data
:
for
item
in
serializer
.
data
:
ids
=
item
[
'id'
]
ids
=
item
[
'id'
]
req
=
requests
.
get
(
f
'{A
CCOUNT
_GROUP}/{ids}/'
)
req
=
requests
.
get
(
f
'{A
UTHENTICATOR
_GROUP}/{ids}/'
)
groups
=
req
.
json
()[
'groups'
]
groups
=
req
.
json
()[
'groups'
]
modules
=
req
.
json
()[
'modules'
]
modules
=
req
.
json
()[
'modules'
]
item
[
'groups'
]
=
groups
item
[
'groups'
]
=
groups
...
...
config/settings/local.py
View file @
08cb5ab7
...
@@ -33,4 +33,4 @@ AUTHENTICATOR_IP = config['SERVICE']['AUTHENTICATOR_IP']
...
@@ -33,4 +33,4 @@ AUTHENTICATOR_IP = config['SERVICE']['AUTHENTICATOR_IP']
AUTHENTICATOR_PATH
=
'/api/v1/authenticator'
AUTHENTICATOR_PATH
=
'/api/v1/authenticator'
VALIDATE_TOKEN_URL
=
f
'http://{AUTHENTICATOR_IP}{AUTHENTICATOR_PATH}/authenticator-validate-token/'
VALIDATE_TOKEN_URL
=
f
'http://{AUTHENTICATOR_IP}{AUTHENTICATOR_PATH}/authenticator-validate-token/'
A
CCOUNT
_GROUP
=
f
'http://{AUTHENTICATOR_IP}{AUTHENTICATOR_PATH}/authenticator-group'
A
UTHENTICATOR
_GROUP
=
f
'http://{AUTHENTICATOR_IP}{AUTHENTICATOR_PATH}/authenticator-group'
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