Merge pull request #326 in RMS/api-main-service from RMSv2 to staging

* commit 'f1dfa39e':
  fixing on current user and set debug false to stagubg
  added condition on action completed

app/applicationlayer/cms/form/header/views.py

@@ -794,10 +794,11 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 form_code=form_code, delegation='Vendor/Implementor'
             ).order_by('level').last()
 
-            if current_user == the_last_vendor.user.code:
+            if (current_user == the_last_vendor.user.code and
+                level == the_last_vendor.level):
                 models.ChangeRequestFormHeader.objects.filter(
                     form_code=form_code
-                ).update(status='Completed')      
+                ).update(status='Completed')
             else:
                 the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
                     form_code=form_code, level=int(next_level),
@@ -822,7 +823,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                     date_sent=datetime.now(),
                     is_action=True
             )
-            
+
             # update current approver details
             models.ChangeRequestFormApprovers.objects.filter(
                 Q(form_code=form_code) & Q(level=int(level))

app/applicationlayer/management/user/serializers.py

@@ -123,16 +123,18 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
         for data in app.order_by('id'):
             if data.id == 1 and user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
                 mod = data.modules.all()
-            if user.user_type.upper() != enums.UserTypeEnum.USER.value:
-                if user.user_type.upper() != enums.UserTypeEnum.USER.value:
-                    user_module = models.Module.objects.filter(
+            elif data.id == 1 and user.user_type.upper() != enums.UserTypeEnum.USER.value:
+                mod = user_module = models.Module.objects.filter(
                         name__icontains="user"
                     )
-                    # if data.id != 1 and user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
-                    if data.id == 1 and user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
-                        mod = mod.union(mod, user_module)
-                    else:
-                        mod = user_module
+            else:
+                mod = data.modules.all()
+            
+            if user.user_type.upper() != enums.UserTypeEnum.USER.value:
+                user_mod = user_module = models.Module.objects.filter(name__icontains="user")
+                mod = mod.union(mod, user_module)
+            else:
+                mod = mod
             mod = mod.order_by("parent", "sort_id")
 
             mod = ModuleSerializer(data=mod, many=True)

config/settings/staging.py

 from .base import *
 import configparser
 
-DEBUG = True
+DEBUG = False
 
 ALLOWED_HOSTS = ['*']