Allow multiple different roles in ACFRestrictFieldAccess

hirasso · May 14, 2024 · 4dd9389 · 4dd9389
1 parent f0419f0
commit 4dd9389
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 30 deletions.
diff --git a/assets/rhau-admin.js b/assets/rhau-admin.js
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,12 @@
-#### 2.1.2 (2024-04-26)
+#### 2.1.3 (2024-05-14)
 
-- Make sure sg-security's cronjob is being scheduled (#c4911c4)
+- Allow multiple different roles in `ACFRestrictFieldAccess` (#c741f06)
+- v2.1.3 (#f0419f0)
+
+#### 2.1.2 (2024-05-08)
+
+- ACFSyncPostDate: force last second of day if date_picker (#a6e4014)
+- Make sure sg-security's cronjob is being scheduled (#b0bda0b)
 
 #### 2.1.1 (2024-04-15)
 

diff --git a/lib/rh-admin-utils/ACFRestrictFieldAccess.php b/lib/rh-admin-utils/ACFRestrictFieldAccess.php
@@ -47,17 +47,20 @@ private static function get_choices(): array
     /**
      * Restrict access to a field
      */
-    public static function prepare_field($field)
+    public static function prepare_field($field): ?array
     {
 
         if (empty($field)) return $field;
 
         $caps = $field['restrict_access'] ?? '' ?: [];
+        if (empty($caps)) {
+            return $field;
+        }
 
         foreach ($caps as $cap) {
-            if (!current_user_can($cap)) return false;
+            if (current_user_can($cap)) return $field;
         }
 
-        return $field;
+        return null;
     }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,11 +45,11 @@
     "webpack-remove-empty-scripts": "^0.7.3"
   },
   "dependencies": {
-    "@alpinejs/mask": "^3.11.1",
+    "@alpinejs/mask": "^3.13.10",
     "@codemirror/lang-html": "^6.4.1",
     "@codemirror/lang-json": "^6.0.1",
     "@codemirror/state": "^6.2.0",
-    "alpinejs": "^3.10.2",
+    "alpinejs": "^3.13.10",
     "codemirror": "^6.0.1"
   }
 }