Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gnukhata
gkcore
Commits
490a1b0a
Commit
490a1b0a
authored
Nov 29, 2017
by
Prajkta Patkar
Committed by
Nitesh Laxman Chaughule
Dec 19, 2017
Browse files
Specified userrole by numbers in database
parent
0c106d03
Changes
1
Hide whitespace changes
Inline
Side-by-side
gkcore/views/api_user.py
View file @
490a1b0a
...
...
@@ -206,7 +206,17 @@ class api_user(object):
result
=
self
.
con
.
execute
(
select
([
gkdb
.
users
.
c
.
username
,
gkdb
.
users
.
c
.
userid
,
gkdb
.
users
.
c
.
userrole
]).
where
(
gkdb
.
users
.
c
.
orgcode
==
authDetails
[
"orgcode"
]).
order_by
(
gkdb
.
users
.
c
.
username
))
users
=
[]
for
row
in
result
:
users
.
append
({
"userid"
:
row
[
"userid"
],
"username"
:
row
[
"username"
],
"userrole"
:
row
[
"userrole"
]})
if
(
row
[
"userrole"
]
==
-
1
):
userroleName
=
"Admin"
elif
(
row
[
"userrole"
]
==
0
):
userroleName
=
"Manager"
elif
(
row
[
"userrole"
]
==
1
):
userroleName
=
"Operator"
elif
(
row
[
"userrole"
]
==
2
):
userroleName
=
"Internal Auditor"
elif
(
row
[
"userrole"
]
==
3
):
userroleName
=
"Godown In Charge"
users
.
append
({
"userid"
:
row
[
"userid"
],
"username"
:
row
[
"username"
],
"userrole"
:
row
[
"userrole"
],
"userrolename"
:
userroleName
})
return
{
"gkstatus"
:
gkcore
.
enumdict
[
"Success"
],
"gkresult"
:
users
}
except
:
return
{
"gkstatus"
:
gkcore
.
enumdict
[
"ConnectionFailed"
]
}
...
...
@@ -428,7 +438,6 @@ class api_user(object):
userData
[
"userroleName"
]
=
"Internal Auditor"
elif
(
row
[
"userrole"
]
==
3
):
userData
[
"userroleName"
]
=
"Godown In Charge"
return
{
"gkstatus"
:
gkcore
.
enumdict
[
"Success"
],
"gkresult"
:
userData
}
except
:
return
{
"gkstatus"
:
gkcore
.
enumdict
[
"ConnectionFailed"
]
}
...
...
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