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
7956fa64
Commit
7956fa64
authored
Oct 21, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
validate pass fix
parent
fa781af4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
app/accesslayer/views.py
app/accesslayer/views.py
+2
-2
app/applicationlayer/cms/auto_email/reminder.py
app/applicationlayer/cms/auto_email/reminder.py
+1
-1
app/applicationlayer/cms/form/approver/serializers.py
app/applicationlayer/cms/form/approver/serializers.py
+7
-7
No files found.
app/accesslayer/views.py
View file @
7956fa64
...
@@ -117,7 +117,7 @@ class ForgotPassword(APIView):
...
@@ -117,7 +117,7 @@ class ForgotPassword(APIView):
user
=
request
.
user
.
email
user
=
request
.
user
.
email
except
Exception
as
e
:
except
Exception
as
e
:
user
=
str
(
settings
.
CATCH_EMAIL
)
user
=
str
(
settings
.
CATCH_EMAIL
)
existingUser
=
User
.
objects
.
filter
(
existingUser
=
User
.
objects
.
filter
(
email
=
email
,
email
=
email
,
username
=
username
)
.
first
()
username
=
username
)
.
first
()
...
@@ -194,7 +194,7 @@ class ValidateForgotPasswordResetToken(APIView):
...
@@ -194,7 +194,7 @@ class ValidateForgotPasswordResetToken(APIView):
if
existingToken
:
if
existingToken
:
if
not
existingToken
.
is_active
:
if
not
existingToken
.
is_active
:
raise
Exception
(
'Request is no longer active'
)
raise
Exception
(
'Request is no longer active'
)
elif
existingToken
.
timeout_at
>
date_now
:
elif
existingToken
.
timeout_at
<
date_now
:
raise
Exception
(
'Token already expired'
)
raise
Exception
(
'Token already expired'
)
return
Response
(
data
=
{
return
Response
(
data
=
{
...
...
app/applicationlayer/cms/auto_email/reminder.py
View file @
7956fa64
...
@@ -55,7 +55,7 @@ class ReminderTriggerAPIView(views.APIView):
...
@@ -55,7 +55,7 @@ class ReminderTriggerAPIView(views.APIView):
list_of_emails
.
append
(
data
.
frm_approver
.
code
)
list_of_emails
.
append
(
data
.
frm_approver
.
code
)
# requestor details
# requestor details
requestor_name
=
data
.
frm_approver
.
form_code
.
requested_by_user
.
name
requestor_name
=
data
.
frm_approver
.
form_code
.
requested_by_user
.
name
requestor_recipient
=
data
.
frm_approver
.
form_code
.
requested_by_user
.
email
requestor_recipient
=
data
.
frm_approver
.
form_code
.
requested_by_user
.
email
...
...
app/applicationlayer/cms/form/approver/serializers.py
View file @
7956fa64
...
@@ -32,16 +32,16 @@ class ChangeRequestFormApproversSerializer(
...
@@ -32,16 +32,16 @@ class ChangeRequestFormApproversSerializer(
ret
[
'editable_comp'
]
=
False
ret
[
'editable_comp'
]
=
False
else
:
else
:
ret
[
'editable_comp'
]
=
True
ret
[
'editable_comp'
]
=
True
if
instance
.
tmp_approver
.
department
or
instance
.
tmp_approver
.
delegation
.
lower
()
==
'requestor'
:
if
instance
.
tmp_approver
.
department
or
instance
.
tmp_approver
.
delegation
.
lower
()
==
'requestor'
:
ret
[
'editable_dept'
]
=
False
ret
[
'editable_dept'
]
=
False
else
:
else
:
ret
[
'editable_dept'
]
=
True
ret
[
'editable_dept'
]
=
True
else
:
else
:
ret
[
'editable_user'
]
=
Fals
e
ret
[
'editable_user'
]
=
Tru
e
ret
[
'editable_comp'
]
=
Fals
e
ret
[
'editable_comp'
]
=
Tru
e
ret
[
'editable_dept'
]
=
Fals
e
ret
[
'editable_dept'
]
=
Tru
e
else
:
else
:
ret
[
'editable_user'
]
=
False
ret
[
'editable_user'
]
=
False
ret
[
'editable_comp'
]
=
False
ret
[
'editable_comp'
]
=
False
...
@@ -76,9 +76,9 @@ class ChangeRequestFormApproversSerializer(
...
@@ -76,9 +76,9 @@ class ChangeRequestFormApproversSerializer(
ret
[
'editable_dept'
]
=
True
ret
[
'editable_dept'
]
=
True
else
:
else
:
ret
[
'editable_user'
]
=
Fals
e
ret
[
'editable_user'
]
=
Tru
e
ret
[
'editable_comp'
]
=
Fals
e
ret
[
'editable_comp'
]
=
Tru
e
ret
[
'editable_dept'
]
=
Fals
e
ret
[
'editable_dept'
]
=
Tru
e
else
:
else
:
ret
[
'editable_user'
]
=
False
ret
[
'editable_user'
]
=
False
ret
[
'editable_comp'
]
=
False
ret
[
'editable_comp'
]
=
False
...
...
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