Fix: Admin Expiry Hours

2026-03-06 18:20:09 +05:45
parent 16d04bd5f7
commit 7492c40668
1 changed files with 7 additions and 3 deletions
@@ -130,14 +130,18 @@ def sign_certificate():

    dept_policy = _get_merged_dept_cert_policy(user_id)
    if dept_policy:
-        if is_org_admin:
+        if not dept_policy["allow_user_expiry"]:
+            expiry_hours = dept_policy["default_expiry_hours"]
+        elif is_org_admin:
            if expiry_hours is not None:
                expiry_hours = min(int(expiry_hours), dept_policy["max_expiry_hours"])
-        elif not dept_policy["allow_user_expiry"]:
-            expiry_hours = dept_policy["default_expiry_hours"]
+            else:
+                expiry_hours = dept_policy["default_expiry_hours"]
        else:
            if expiry_hours is not None:
                expiry_hours = min(int(expiry_hours), dept_policy["max_expiry_hours"])
+            else:
+                expiry_hours = dept_policy["default_expiry_hours"]
        policy_extensions = dept_policy["extensions"]
    else:
        policy_extensions = None