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
316f9c82
Commit
316f9c82
authored
Dec 04, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
approver msg
parent
ca76ffad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/businesslayer/changerequest/change_request.py
app/businesslayer/changerequest/change_request.py
+2
-2
app/helper/email_service/templates/RMS-CRREVISED.html
app/helper/email_service/templates/RMS-CRREVISED.html
+3
-3
No files found.
app/businesslayer/changerequest/change_request.py
View file @
316f9c82
...
@@ -568,7 +568,7 @@ def cr_routing_actions(approver_instance, current_user, move_to_level):
...
@@ -568,7 +568,7 @@ def cr_routing_actions(approver_instance, current_user, move_to_level):
# reject from requestor action
# reject from requestor action
if
delegation
.
lower
()
==
'requestor'
:
if
delegation
.
lower
()
==
'requestor'
:
notification_msg
=
VENDOR_REJECT
_MESSAGE
.
split
(
';'
)[
0
]
notification_msg
=
REVISED
_MESSAGE
.
split
(
';'
)[
0
]
# send reject email to vendor
# send reject email to vendor
send_mail_vendor
(
send_mail_vendor
(
...
@@ -645,7 +645,7 @@ def cr_routing_actions(approver_instance, current_user, move_to_level):
...
@@ -645,7 +645,7 @@ def cr_routing_actions(approver_instance, current_user, move_to_level):
approver_code
=
back_to_approver
.
user
.
code
approver_code
=
back_to_approver
.
user
.
code
approver_notification_msg
=
REVISED
_MESSAGE
.
split
(
';'
)[
0
]
approver_notification_msg
=
APPROVER
_MESSAGE
.
split
(
';'
)[
0
]
send_mail_approver
(
send_mail_approver
(
current_user
,
form_code
,
delegation
,
current_user
,
form_code
,
delegation
,
...
...
app/helper/email_service/templates/RMS-CRREVISED.html
View file @
316f9c82
<!DOCTYPE html>
<!DOCTYPE html>
<html>
<html>
<head>
<head>
<title>
RMS: Change Request Re
vision
</title>
<title>
RMS: Change Request Re
jected
</title>
</head>
</head>
<body
style=
"font-family: arial;"
>
<body
style=
"font-family: arial;"
>
<h3>
Resource Management System
(
RMS
)
</h3>
<h3>
Resource Management System
(
RMS
)
</h3>
<h3
style=
"color:#888888;"
>
Change Request Re
vision
</h3><br>
<h3
style=
"color:#888888;"
>
Change Request Re
jected
</h3><br>
<p>
Dear {name},
</p><br>
<p>
Dear {name},
</p><br>
<p>
A change request has been submitted for your acknowledgement to revise. Please see the details of the change request below.
</p><br>
<p>
A change request has been submitted for your acknowledgement to revise. Please see the details of the change request below.
</p><br>
...
@@ -30,6 +30,6 @@
...
@@ -30,6 +30,6 @@
<p>
Powered by
</p>
<p>
Powered by
</p>
<img
src=
"https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png"
class=
"img-responsive"
style=
"width:150px;height:auto;"
/>
<img
src=
"https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png"
class=
"img-responsive"
style=
"width:150px;height:auto;"
/>
</body>
</body>
</html>
</html>
\ No newline at end of file
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