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
e60aeee6
Commit
e60aeee6
authored
Oct 01, 2019
by
John Red Medrano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify params on ordering at accounts
parent
868ba167
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
5 deletions
+28
-5
app/applicationlayer/management/account/views.py
app/applicationlayer/management/account/views.py
+8
-2
env.template.ini
env.template.ini
+20
-3
No files found.
app/applicationlayer/management/account/views.py
View file @
e60aeee6
...
@@ -36,12 +36,18 @@ class UserViewSet(viewsets.ModelViewSet):
...
@@ -36,12 +36,18 @@ class UserViewSet(viewsets.ModelViewSet):
lookup_field
=
'code'
lookup_field
=
'code'
filter_backends
=
(
DjangoFilterBackend
,
SearchFilter
,
OrderingFilter
)
filter_backends
=
(
DjangoFilterBackend
,
SearchFilter
,
OrderingFilter
)
filterset_class
=
AccountFilterset
filterset_class
=
AccountFilterset
ordering_fields
=
'__all__'
ordering_fields
=
(
'department__company__name'
,
'department__name'
,
'name'
,
'code'
,
'email'
,
'contact_no'
)
search_fields
=
(
search_fields
=
(
'name'
,
'code'
,
'name'
,
'code'
,
'department'
,
'department__company__name'
,
'department__company__name'
,
'department__name'
,
'department__name'
,
'email'
,
'contact_no'
'email'
,
'contact_no'
,
'companies'
)
)
@
rms
.
user_create
@
rms
.
user_create
...
...
env.template.ini
View file @
e60aeee6
...
@@ -6,7 +6,7 @@ DATABASE_PASSWORD =
...
@@ -6,7 +6,7 @@ DATABASE_PASSWORD =
DATABASE_HOST =
DATABASE_HOST =
DATABASE_PORT
=
DATABASE_PORT
=
SESSION_TIMEOUT =
SESSION_TIMEOUT =
FRONT_END_URL
=
http://devweb.rmsv2.oneberrysystem.com
FRONT_END_URL
=
AUTH_ACCESSS_TOKEN_TIMEOUT =
AUTH_ACCESSS_TOKEN_TIMEOUT =
USER_DEFAULT_PASSWORD
=
USER_DEFAULT_PASSWORD
=
CATCH_EMAIL = gladys@tirsolutions.com
CATCH_EMAIL = gladys@tirsolutions.com
...
@@ -21,7 +21,7 @@ DATABASE_PASSWORD =
...
@@ -21,7 +21,7 @@ DATABASE_PASSWORD =
DATABASE_HOST =
DATABASE_HOST =
DATABASE_PORT
=
DATABASE_PORT
=
SESSION_TIMEOUT =
SESSION_TIMEOUT =
FRONT_END_URL
=
http://
devweb.rmsv2
.oneberrysystem.com
FRONT_END_URL
=
http://
staging.rms
.oneberrysystem.com
AUTH_ACCESSS_TOKEN_TIMEOUT
=
AUTH_ACCESSS_TOKEN_TIMEOUT
=
USER_DEFAULT_PASSWORD =
USER_DEFAULT_PASSWORD =
CATCH_EMAIL
=
gladys@tirsolutions.com
CATCH_EMAIL
=
gladys@tirsolutions.com
...
@@ -43,6 +43,23 @@ CATCH_EMAIL = gladys@tirsolutions.com
...
@@ -43,6 +43,23 @@ CATCH_EMAIL = gladys@tirsolutions.com
CR_LINK
=
http://devweb.rmsv2.oneberrysystem.com/cms/change-request/form/view
CR_LINK
=
http://devweb.rmsv2.oneberrysystem.com/cms/change-request/form/view
REALTIMESERVER_IP
=
127.0.0.1:8000
REALTIMESERVER_IP
=
127.0.0.1:8000
[STAGING]
DATABASE_ENGINE
=
django.db.backends.mysql
DATABASE_NAME
=
rms_db
DATABASE_USER
=
DATABASE_PASSWORD =
DATABASE_HOST
=
DATABASE_PORT =
SESSION_TIMEOUT
=
FRONT_END_URL
=
http://staging.rms.oneberrysystem.com
AUTH_ACCESSS_TOKEN_TIMEOUT
=
3600
USER_DEFAULT_PASSWORD
=
password
CATCH_EMAIL
=
CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
REALTIMESERVER_IP
=
127.0.0.1:8000
[LOCAL]
[LOCAL]
DATABASE_ENGINE
=
django.db.backends.mysql
DATABASE_ENGINE
=
django.db.backends.mysql
DATABASE_NAME
=
rms_db
DATABASE_NAME
=
rms_db
...
@@ -59,7 +76,7 @@ CR_LINK = http://localhost:8000/cms/change-request/form/view
...
@@ -59,7 +76,7 @@ CR_LINK = http://localhost:8000/cms/change-request/form/view
REALTIMESERVER_IP
=
127.0.0.1:8000
REALTIMESERVER_IP
=
127.0.0.1:8000
[SETTINGS]
[SETTINGS]
CONFIG
=
config.settings.
local
CONFIG
=
config.settings.
staging
[NOTIFICATION_EMAIL]
[NOTIFICATION_EMAIL]
APPROVER_MESSAGE
=
has sent you an APPROVAL REQUEST for change request;RMS-ACTIONREQUIRED
APPROVER_MESSAGE
=
has sent you an APPROVAL REQUEST for change request;RMS-ACTIONREQUIRED
...
...
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