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
8fcb23a9
Commit
8fcb23a9
authored
Oct 15, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #380 in RMS/api-main-service from gladys-dev2 to RMSv2
* commit '
abc8ae6e
': add context
parents
39ae6d49
abc8ae6e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
app/accesslayer/views.py
app/accesslayer/views.py
+2
-2
app/businesslayer/changerequest/change_request.py
app/businesslayer/changerequest/change_request.py
+3
-2
No files found.
app/accesslayer/views.py
View file @
8fcb23a9
...
@@ -131,12 +131,12 @@ class ForgotPassword(APIView):
...
@@ -131,12 +131,12 @@ class ForgotPassword(APIView):
REF
=
'AUTH'
REF
=
'AUTH'
TOKEN
=
''
TOKEN
=
''
TIMEOUT
=
100
00
TIMEOUT
=
36
00
PASSCODE
=
0
PASSCODE
=
0
# Generate Random token for TOKEN
# Generate Random token for TOKEN
TOKEN
=
Token
()
.
generate_key
()
TOKEN
=
Token
()
.
generate_key
()
# Generate Random number for PASSCODE
# Generate Random number for PASSCODE
rands
=
[]
rands
=
[]
rands
.
append
(
randrange
(
10
))
rands
.
append
(
randrange
(
10
))
...
...
app/businesslayer/changerequest/change_request.py
View file @
8fcb23a9
...
@@ -279,7 +279,8 @@ def form_add_edit_delete(form_request_body,
...
@@ -279,7 +279,8 @@ def form_add_edit_delete(form_request_body,
serializer
=
serializer_data
(
frm_instance
,
serializer
=
serializer_data
(
frm_instance
,
data
=
data
,
data
=
data
,
partial
=
partial
)
partial
=
partial
,
context
=
{
"request"
:
self
.
request
})
serializer
.
is_valid
(
raise_exception
=
True
)
serializer
.
is_valid
(
raise_exception
=
True
)
old_instance
=
model_to_dict
(
frm_instance
)
old_instance
=
model_to_dict
(
frm_instance
)
...
@@ -370,7 +371,7 @@ def attachment_add_edit_delete(form_request_body,
...
@@ -370,7 +371,7 @@ def attachment_add_edit_delete(form_request_body,
"uploaded_by"
:
id_number
"uploaded_by"
:
id_number
}
}
data
=
{
**
i
,
**
frm_code
}
data
=
{
**
i
,
**
frm_code
}
old_instance
=
model_to_dict
(
frm_instance
)
old_instance
=
model_to_dict
(
frm_instance
)
if
not
data_old
==
i
:
if
not
data_old
==
i
:
...
...
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