Merge pull request #403 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit '7956fa64':
  validate pass fix

app/accesslayer/views.py

@@ -194,7 +194,7 @@ class ValidateForgotPasswordResetToken(APIView):
         if existingToken:
             if not existingToken.is_active:
                 raise Exception('Request is no longer active')
-            elif existingToken.timeout_at > date_now:
+            elif existingToken.timeout_at < date_now:
                 raise Exception('Token already expired')
             
             return Response(data={

app/applicationlayer/cms/form/approver/serializers.py

@@ -39,9 +39,9 @@ class ChangeRequestFormApproversSerializer(
                         ret['editable_dept'] = True
 
                 else:
-                    ret['editable_user'] = False
-                    ret['editable_comp'] = False
-                    ret['editable_dept'] = False
+                    ret['editable_user'] = True
+                    ret['editable_comp'] = True
+                    ret['editable_dept'] = True
             else:
                 ret['editable_user'] = False
                 ret['editable_comp'] = False
@@ -76,9 +76,9 @@ class ChangeRequestFormApproversSerializer(
                         ret['editable_dept'] = True
 
                 else:
-                    ret['editable_user'] = False
-                    ret['editable_comp'] = False
-                    ret['editable_dept'] = False
+                    ret['editable_user'] = True
+                    ret['editable_comp'] = True
+                    ret['editable_dept'] = True
             else:
                 ret['editable_user'] = False
                 ret['editable_comp'] = False