Added: restricted action to user

webreinvent · Jun 22, 2024 · 6360572 · 6360572
1 parent 47f3d2e
commit 6360572
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/skeletons/vaahcms/module-vue3/Vue/vaahvue/pinia/vaah.js b/skeletons/vaahcms/module-vue3/Vue/vaahvue/pinia/vaah.js
@@ -120,25 +120,12 @@ export const vaah = defineStore({
 
     //----------------------------------------------------------
     processResponse: function (response, show_success) {
-      if (
-        response.data.failed || response.data.success === false
-      ) {
-
-        if (response.data.messages) {
-          this.toastErrors(response.data.messages)
-        }
-
-        if (response.data.errors) {
-          this.toastErrors(response.data.errors)
-        }
-
+      if (response.data.errors) {
+        this.toastErrors(response.data.errors)
       }
 
-      if (
-        response.data.success
-        && response.data.success === true
-        && response.data.messages
-        && show_success === true
+      if (response.data.messages
+          && show_success === true
       ) {
         this.toastSuccess(response.data.messages)
       }

diff --git a/skeletons/vaahcms/users/Http/Controllers/Controller.php.ejs b/skeletons/vaahcms/users/Http/Controllers/Controller.php.ejs
@@ -259,6 +259,16 @@ class <%= controller_name %>Controller extends Controller
     {
 
         try {
+
+            $is_restricted = <%= model_name %>::restrictedActions($action, $id);
+
+            if(isset($is_restricted['success']) && !$is_restricted['success'])
+            {
+                $response =  <%= model_name %>::getItem($id);
+                $response['errors'] = $is_restricted['errors'];
+                return response()->json($response);
+            }
+
             $response = <%= model_name %>::itemAction($request,$id,$action);
         } catch (\Exception $e) {
             $response = [];