Merge branch 'core-dev-red-develop' into 'core-dev'

fixing on core-dev

See merge request rms/Backend/api-main-service!903

app/applicationlayer/management/account/serializer.py

@@ -25,16 +25,12 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
     department = serializers.SerializerMethodField()
     company = serializers.SerializerMethodField()
     cms_privilege = serializers.SerializerMethodField()
-    # create_form = serializers.SerializerMethodField()
-    # create_template = serializers.SerializerMethodField()
 
     class Meta:
         model = User
         fields = (
             'id',
             "cms_privilege",
-            # 'create_form',
-            # 'create_template',
             'code', 'name',
             'username', 'contact_no',
             'image', 'company',
@@ -74,6 +70,11 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
 
         if test.count() >= 1:
             return {**test.values("create_form","create_template")[0]}
+        else:
+            return {
+                "create_form": False,
+                "create_template": False
+            }
 
     def get_image(self, user):
         request = self.context.get('request')