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
12a93c89
Commit
12a93c89
authored
Sep 20, 2019
by
John Red Medrano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added code on current user
parent
9c57a617
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
17 deletions
+23
-17
app/applicationlayer/management/user/serializers.py
app/applicationlayer/management/user/serializers.py
+23
-17
No files found.
app/applicationlayer/management/user/serializers.py
View file @
12a93c89
...
...
@@ -62,6 +62,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
def
get_department
(
self
,
user
):
data
=
{
"id"
:
user
.
department
.
id
,
"code"
:
user
.
department
.
code
"name"
:
user
.
department
.
name
}
return
data
...
...
@@ -69,6 +70,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
def
get_company
(
self
,
user
):
data
=
{
"id"
:
user
.
department
.
company
.
id
,
"code"
:
user
.
department
.
company
.
code
"name"
:
user
.
department
.
company
.
name
}
return
data
...
...
@@ -94,25 +96,29 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
rms
=
models
.
Application
.
objects
.
filter
(
id
=
1
)
.
values
()
.
first
()
for
data
in
app
:
if
data
.
id
==
1
:
if
user
.
user_type
.
upper
()
==
enums
.
UserTypeEnum
.
SUPER_USER
.
value
:
rms_module
=
models
.
Module
.
objects
.
filter
(
Q
(
application
=
rms
[
'code'
])
&
Q
(
parent
=
0
)
)
elif
user
.
user_type
.
upper
()
!=
enums
.
UserTypeEnum
.
USER
.
value
:
rms_module
=
models
.
Module
.
objects
.
filter
(
code
=
"MODULE-20190919-0000006"
)
else
:
rms_module
=
data
.
modules
.
all
()
# if data.id == 1:
# if user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
# rms_module = models.Module.objects.filter(
# Q(application=rms['code']) &
# Q(parent=0)
# )
# elif user.user_type.upper() != enums.UserTypeEnum.USER.value:
# rms_module = models.Module.objects.filter(
# code="MODULE-20190919-0000006"
# )
# else:
# rms_module = data.modules.all()
# if user.user_type.upper() != enums.UserTypeEnum.USER.value:
# rms_module2 = models.Module.objects.filter(code="MODULE-20190919-0000006")
# datas = rms_module.union(rms_module, rms_module2)
# else:
# datas = rms_module
mod
=
data
.
modules
.
all
()
if
user
.
user_type
.
upper
()
!=
enums
.
UserTypeEnum
.
USER
.
value
:
rms_module2
=
models
.
Module
.
objects
.
filter
(
code
=
"MODULE-20190919-0000006"
)
datas
=
rms_module
.
union
(
rms_module
,
rms_module2
)
else
:
datas
=
rms_module
user_module
=
models
.
Module
.
objects
.
filter
(
code
=
"MODULE-20190919-0000006"
)
mod
=
mod
.
union
(
mod
,
user_module
)
mod
=
ModuleSerializer
(
data
=
datas
,
many
=
True
)
mod
=
ModuleSerializer
(
data
=
mod
,
many
=
True
)
mod
.
is_valid
()
app_body
=
{}
...
...
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