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
83bfb989
Commit
83bfb989
authored
Oct 01, 2019
by
John Red Medrano
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #243 in RMS/api-main-service from red-develop to RMSv2
* commit '
6584012f
': fixing current user
parents
3af64ebf
6584012f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
app/applicationlayer/management/user/serializers.py
app/applicationlayer/management/user/serializers.py
+5
-5
No files found.
app/applicationlayer/management/user/serializers.py
View file @
83bfb989
...
...
@@ -115,15 +115,15 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
# datas = rms_module
mod
=
data
.
modules
.
filter
(
~
Q
(
name__icontains
=
'header'
))
if
user
.
user_type
.
upper
()
!=
enums
.
UserTypeEnum
.
USER
.
value
:
if
user
.
user_type
.
upper
()
==
enums
.
UserTypeEnum
.
SUPER_USER
.
value
and
str
(
app
.
code
)
==
'APP-20190923-0000001'
:
if
user
.
user_type
.
upper
()
!=
enums
.
UserTypeEnum
.
USER
.
value
:
user_module
=
models
.
Module
.
objects
.
filter
(
name__icontains
=
"user"
)
mod
=
mod
.
union
(
mod
,
user_module
)
else
:
mod
=
user_module
=
models
.
Module
.
objects
.
filter
(
name__icontains
=
"user"
)
#
else:
#
mod = user_module = models.Module.objects.filter(
#
name__icontains="user"
#
)
# mod = mod.exclude(parent=0)
mod
=
mod
.
order_by
(
"parent"
,
"sort_id"
)
...
...
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