diff --git a/skeletons/vaahcms/taxonomies/Vue/pages/template/components/Table.vue.ejs b/skeletons/vaahcms/taxonomies/Vue/pages/template/components/Table.vue.ejs
index 56352ef..ccd694b 100644
--- a/skeletons/vaahcms/taxonomies/Vue/pages/template/components/Table.vue.ejs
+++ b/skeletons/vaahcms/taxonomies/Vue/pages/template/components/Table.vue.ejs
@@ -67,9 +67,7 @@ const openTaxonomyTypeModal = () => {
+ :sortable="false">
{{ prop.data.slug }}
@@ -81,13 +79,11 @@ const openTaxonomyTypeModal = () => {
/>
-
+
+ :sortable="false">
- {{ prop.data.type.name }}
+ {{ prop.data.type.name }}
diff --git a/skeletons/vaahcms/users/Http/Controllers/Controller.php.ejs b/skeletons/vaahcms/users/Http/Controllers/Controller.php.ejs
index 80c8864..5994475 100644
--- 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 = [];
diff --git a/skeletons/vaahcms/users/Vue/pages/template/List.vue.ejs b/skeletons/vaahcms/users/Vue/pages/template/List.vue.ejs
index 9761aa0..2bd511f 100644
--- a/skeletons/vaahcms/users/Vue/pages/template/List.vue.ejs
+++ b/skeletons/vaahcms/users/Vue/pages/template/List.vue.ejs
@@ -50,7 +50,7 @@ onMounted(async () => {
-
+
diff --git a/skeletons/vaahcms/users/Vue/pages/template/components/Actions.vue.ejs b/skeletons/vaahcms/users/Vue/pages/template/components/Actions.vue.ejs
index e1f46d4..22c9a34 100644
--- a/skeletons/vaahcms/users/Vue/pages/template/components/Actions.vue.ejs
+++ b/skeletons/vaahcms/users/Vue/pages/template/components/Actions.vue.ejs
@@ -53,21 +53,7 @@ const toggleBulkMenuState = (event) => {
:popup="true"
/>
-
-
-
-
-
-
+
@@ -109,6 +95,22 @@ const toggleBulkMenuState = (event) => {
data-testid="<%= controller_name_lower %>-action_reset"
@click="store.resetQuery()"
/>
+
+
+
+
+
diff --git a/skeletons/vaahcms/users/Vue/stores/store-template.js.ejs b/skeletons/vaahcms/users/Vue/stores/store-template.js.ejs
index bb4de78..a0c2bec 100644
--- a/skeletons/vaahcms/users/Vue/stores/store-template.js.ejs
+++ b/skeletons/vaahcms/users/Vue/stores/store-template.js.ejs
@@ -591,6 +591,9 @@ export const use<%= model_name %>Store = defineStore({
method: method,
show_success: false
};
+
+ options.params.query = vaah().clone(this.query);
+
await vaah().ajax(
url,
this.updateListAfter,