fixed conflict

app/applicationlayer/management/account/views.py

@@ -36,12 +36,18 @@ class UserViewSet(viewsets.ModelViewSet):
     lookup_field = 'code'
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = AccountFilterset
-    ordering_fields = '__all__'
+    ordering_fields = (
+        'department__company__name', 'department__name',
+        'name', 'code',
+        'email', 'contact_no'
+    )
     search_fields = (
         'name', 'code',
+        'department',
         'department__company__name',
         'department__name',
-        'email', 'contact_no'
+        'email', 'contact_no',
+        'companies'
     )
 
     @rms.user_create

app/helper/email_service/sender.py

@@ -20,7 +20,7 @@ def account_created(args):
     FC = FC.replace('{name}', name)
     FC = FC.replace('{username}', username)
     FC = FC.replace('{password}', password)
-    FC = FC.replace('{url}', settings.FRONT_END_URL + '/cms/profile')
+    FC = FC.replace('{url}', settings.FRONT_END_URL + '/cms/profile') # changed
     try:
         send_mail(
             subject='OB RMS: Welcome!',

env.template.ini

@@ -6,7 +6,7 @@ DATABASE_PASSWORD =
 DATABASE_HOST = 
 DATABASE_PORT = 
 SESSION_TIMEOUT = 
-FRONT_END_URL = http://staging.rms.oneberrysystem.com
+FRONT_END_URL = 
 AUTH_ACCESSS_TOKEN_TIMEOUT = 
 USER_DEFAULT_PASSWORD = 
 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
 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]
 DATABASE_ENGINE = django.db.backends.mysql
 DATABASE_NAME = rms_db
@@ -59,7 +76,7 @@ CR_LINK = http://localhost:8000/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
 
 [SETTINGS]
-CONFIG = config.settings.local
+CONFIG = config.settings.staging
 
 [NOTIFICATION_EMAIL]
 APPROVER_MESSAGE = has sent you an APPROVAL REQUEST for change request;RMS-ACTIONREQUIRED