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
eba9fc99
Commit
eba9fc99
authored
Jan 28, 2020
by
John Red Medrano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert "set domain email to rms-hub.com"
This reverts commit
24d707c7
.
parent
24d707c7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
66 additions
and
18 deletions
+66
-18
app/applicationlayer/master/Account/views.py
app/applicationlayer/master/Account/views.py
+1
-1
app/applicationlayer/master/urls.py
app/applicationlayer/master/urls.py
+1
-0
app/entities/models.py
app/entities/models.py
+40
-0
config/settings/base.py
config/settings/base.py
+24
-17
No files found.
app/applicationlayer/master/Account/views.py
View file @
eba9fc99
...
...
@@ -31,7 +31,7 @@ class AdminAccountViewSet(viewsets.ModelViewSet):
# @rms.department_list
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
try
:
queryset
=
self
.
filter_queryset
(
self
.
get_queryset
())
if
len
(
self
.
request
.
query_params
)
>
0
:
dept
=
self
.
request
.
query_params
[
'department_code'
]
...
...
app/applicationlayer/master/urls.py
View file @
eba9fc99
...
...
@@ -17,4 +17,5 @@ router.register(r'attachments', MasterAttachmentViewSet)
urlpatterns
=
[
path
(
''
,
include
(
router
.
urls
)),
url
(
r'^user-types/$'
,
UserTypeViewSet
.
as_view
(),
name
=
"user-types"
),
url
(
r'^dashboard/$'
,
RMSDashBoardViewSet
.
as_view
(),
name
=
"dashboard"
),
]
app/entities/models.py
View file @
eba9fc99
...
...
@@ -1233,3 +1233,43 @@ class AssetGroup(models.Model):
self
.
code
=
code
self
.
created
=
datetime
.
now
()
self
.
save
()
class
ChangeRequestSettings
(
models
.
Model
):
code
=
models
.
CharField
(
unique
=
True
,
max_length
=
255
)
active_user
=
models
.
ForeignKey
(
User
,
on_delete
=
models
.
CASCADE
,
to_field
=
'code'
,
related_name
=
'cms_settings_active_users'
)
behalf_user
=
models
.
ForeignKey
(
User
,
on_delete
=
models
.
CASCADE
,
to_field
=
'code'
,
related_name
=
'cms_settings_behalf_users'
)
behalf_approved
=
models
.
BooleanField
(
default
=
False
)
behalf_accepted
=
models
.
BooleanField
(
default
=
False
)
behalf_rejected
=
models
.
BooleanField
(
default
=
False
)
behalf_implemented
=
models
.
BooleanField
(
default
=
False
)
behalf_completed
=
models
.
BooleanField
(
default
=
False
)
created
=
models
.
DateTimeField
(
auto_now_add
=
True
)
deleted_at
=
models
.
DateTimeField
(
null
=
True
,
blank
=
True
)
class
Meta
:
db_table
=
'change_request_settings'
ordering
=
[
'-created'
]
unique_together
=
[
'active_user'
,
'behalf_user'
]
def
__str__
(
self
):
return
f
'{self.code}'
def
save
(
self
,
*
args
,
**
kwargs
):
super
(
ChangeRequestSettings
,
self
)
.
save
(
*
args
,
**
kwargs
)
code
=
number_generator
(
enums
.
GenerateCode
.
CMS_SETTINGS
.
value
,
self
.
id
)
if
self
.
code
==
''
:
self
.
code
=
code
self
.
created
=
datetime
.
now
()
self
.
save
()
\ No newline at end of file
config/settings/base.py
View file @
eba9fc99
...
...
@@ -165,26 +165,33 @@ REST_FRAMEWORK = {
'PAGE_SIZE'
:
10
}
# EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
# EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
# EMAIL_PORT = 587
# EMAIL_HOST_USER = 'AKIAIPRWQKYV6N5SMLUA'
# EMAIL_HOST_PASSWORD = 'ApK1dtH2qpT/oMl9MEauFvyN9XZDQ1fjzd8TumIs71NG'
# EMAIL_USE_SSL = False
# EMAIL_USE_TLS = True
# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
# EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
# EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
EMAIL_TEMPLATES_ROOT
=
os
.
path
.
join
(
BASE_DIR
,
"app/helper/email_service/templates"
)
EMAIL_HOST
=
'email-smtp.us-west-2.amazonaws.com'
EMAIL_PORT
=
587
EMAIL_HOST_USER
=
'AKIA
YA4XVX5XFZHRQATF
'
EMAIL_HOST_PASSWORD
=
'
BIOG15v+WTbTiBtPKkn+LCjg0UHqO3nLFQezh4pi6g3y
'
EMAIL_HOST_USER
=
'AKIA
IPRWQKYV6N5SMLUA
'
EMAIL_HOST_PASSWORD
=
'
ApK1dtH2qpT/oMl9MEauFvyN9XZDQ1fjzd8TumIs71NG
'
EMAIL_USE_SSL
=
False
EMAIL_USE_TLS
=
True
EMAIL_BACKEND
=
'django.core.mail.backends.smtp.EmailBackend'
EMAIL_DEFAULT_SENDER
=
'noreply@rms-hub.com'
EMAIL_DEFAULT_SENDER
=
'rms.noreply@oneberrysystem.com'
# EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
# EMAIL_HOST = config['DEV']['EMAIL_HOST']
# EMAIL_PORT = config['DEV']['EMAIL_PORT']
# EMAIL_HOST_USER = config['DEV']['EMAIL_PORT']
# EMAIL_HOST_PASSWORD = config['DEV']['EMAIL_HOST_PASSWORD']
# EMAIL_USE_SSL = config['DEV']['EMAIL_USE_SSL']
# EMAIL_USE_TLS = config['DEV']['EMAIL_USE_TLS']
# EMAIL_BACKEND = config['DEV']['EMAIL_BACKEND']
# EMAIL_DEFAULT_SENDER = config['DEV']['EMAIL_DEFAULT_SENDER']
# EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
# EMAIL_PORT = 587
# EMAIL_HOST_USER = 'AKIAYA4XVX5XFZHRQATF'
# EMAIL_HOST_PASSWORD = 'BIOG15v+WTbTiBtPKkn+LCjg0UHqO3nLFQezh4pi6g3y'
# EMAIL_USE_SSL = False
# EMAIL_USE_TLS = True
# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
# EMAIL_DEFAULT_SENDER = 'noreply@rms-hub.com'
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