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
2d47ffc8
Commit
2d47ffc8
authored
Nov 12, 2019
by
John Red Medrano
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #455 in RMS/api-main-service from red-develop to RMSv2
* commit '
ab2eb4ec
': removed catch
parents
8feef048
ab2eb4ec
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
117 additions
and
117 deletions
+117
-117
app/applicationlayer/management/account/views.py
app/applicationlayer/management/account/views.py
+117
-117
No files found.
app/applicationlayer/management/account/views.py
View file @
2d47ffc8
...
@@ -250,7 +250,7 @@ class UserViewSet(viewsets.ModelViewSet):
...
@@ -250,7 +250,7 @@ class UserViewSet(viewsets.ModelViewSet):
email_users
=
[]
email_users
=
[]
for
data
,
keys
in
df
.
iterrows
():
for
data
,
keys
in
df
.
iterrows
():
try
:
#
try:
user_department
=
Department
.
objects
.
filter
(
user_department
=
Department
.
objects
.
filter
(
Q
(
name__icontains
=
keys
[
'department'
])
&
Q
(
name__icontains
=
keys
[
'department'
])
&
Q
(
company__name__icontains
=
logged_user_company
)
Q
(
company__name__icontains
=
logged_user_company
)
...
@@ -374,17 +374,17 @@ class UserViewSet(viewsets.ModelViewSet):
...
@@ -374,17 +374,17 @@ class UserViewSet(viewsets.ModelViewSet):
# status=status.HTTP_201_CREATED
# status=status.HTTP_201_CREATED
# )
# )
except
IntegrityError
as
e
:
#
except IntegrityError as e:
return
Response
(
#
return Response(
{
"message"
:
f
"Record already exist at row {data + 2}"
},
#
{"message": f"Record already exist at row {data + 2}"},
status
=
status
.
HTTP_201_CREATED
#
status=status.HTTP_201_CREATED
)
#
)
except
KeyError
as
e
:
#
except KeyError as e:
return
Response
(
#
return Response(
{
"message"
:
"Missing column user_type"
},
#
{"message": "Missing column user_type"},
status
=
status
.
HTTP_201_CREATED
#
status=status.HTTP_201_CREATED
)
#
)
del
users
[
'department'
]
del
users
[
'department'
]
del
users
[
'contact_no'
]
del
users
[
'contact_no'
]
...
...
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