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
2180d29e
Commit
2180d29e
authored
Jan 15, 2020
by
John Red Medrano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added auto email when added user on cms settings
parent
2c0eb015
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
6 deletions
+23
-6
app/applicationlayer/cms/cms_settings/views.py
app/applicationlayer/cms/cms_settings/views.py
+20
-3
app/helper/email_service/sender.py
app/helper/email_service/sender.py
+3
-3
No files found.
app/applicationlayer/cms/cms_settings/views.py
View file @
2180d29e
from
rest_framework
import
status
,
viewsets
from
rest_framework.response
import
Response
from
app.entities
import
enums
from
app.entities.models
import
ChangeRequestSettings
from
app.entities.models
import
ChangeRequestSettings
,
User
from
app.applicationlayer.utils
import
CustomPagination
,
status_message_response
from
django_filters
import
rest_framework
as
filters
from
django_filters.rest_framework
import
DjangoFilterBackend
...
...
@@ -15,6 +15,8 @@ from app.applicationlayer.cms.cms_settings.table_filter import (
from
django.db
import
transaction
from
rest_framework.exceptions
import
ValidationError
from
django.db
import
IntegrityError
from
app.applicationlayer.utils
import
main_threading
from
app.helper.email_service
import
sender
class
CMSSettingsViewSet
(
viewsets
.
ModelViewSet
):
...
...
@@ -47,7 +49,7 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
'List of CMS Settings found'
,
serializer
.
data
)
return
self
.
get_paginated_response
(
message
)
serializer
=
self
.
get_serializer
(
queryset
,
many
=
True
)
...
...
@@ -66,6 +68,7 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
cms_settings
=
request
.
data
[
'cms_settings'
]
for
cms_setting
in
cms_settings
:
cms_setting
[
'active_user'
]
=
logged_user
data_cms_settings
.
append
(
cms_setting
)
...
...
@@ -73,7 +76,21 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
data
=
data_cms_settings
,
many
=
True
)
ChangeRequestSettings
.
objects
.
filter
(
active_user
=
logged_user
)
.
delete
()
ChangeRequestSettings
.
objects
.
filter
(
active_user
=
logged_user
)
.
delete
()
active_user
=
self
.
request
.
user
.
name
action
=
'Added'
admin
=
request
.
user
.
email
for
data
in
data_cms_settings
:
recipient
=
User
.
objects
.
get
(
code
=
str
(
data
[
'behalf_user'
])
)
args
=
[
behalf_user
.
name
,
action
,
active_user
,
recipient
.
email
,
admin
]
main_threading
(
args
,
sender
.
on_behalf
)
if
serializer
.
is_valid
(
raise_exception
=
True
):
serializer
.
save
()
...
...
app/helper/email_service/sender.py
View file @
2180d29e
...
...
@@ -599,13 +599,13 @@ def routing_table_overdue(args):
# RMS-ONBEHALF
def
routing_table_overdue
(
args
):
def
on_behalf
(
args
):
name
=
args
[
0
]
action
=
args
[
1
]
active_user
=
args
[
2
]
recipient
=
args
[
9
]
admin
=
args
[
10
]
recipient
=
args
[
3
9
]
admin
=
args
[
4
]
F
=
open
(
os
.
path
.
join
(
settings
.
EMAIL_TEMPLATES_ROOT
,
'RMS-ONBEHALF.html'
),
'r'
)
...
...
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