From f42d6d3737c6c1187ba52d0929e907033c88f5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Busso?=
<90727999+agustinbusso@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:06:31 -0300
Subject: [PATCH 1/4] Fix tab indexes issue
---
resources/views/components/categorized_resource.blade.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/resources/views/components/categorized_resource.blade.php b/resources/views/components/categorized_resource.blade.php
index d9814b698b..87e7d9691a 100644
--- a/resources/views/components/categorized_resource.blade.php
+++ b/resources/views/components/categorized_resource.blade.php
@@ -51,15 +51,15 @@
- {{ $tabs[1] ?? __('Categories') }}
+ {{ $tabs[2] ?? __('Categories') }}
@endif
- @isset($tabs[2])
+ @isset($tabs[3])
- {{ $tabs[2] ?? __('Archived Processes') }}
+ {{ $tabs[3] ?? __('Archived Processes') }}
@endisset
From 1521807a0204b923904ccd66c728e84aab4cd5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Busso?=
<90727999+agustinbusso@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:06:55 -0300
Subject: [PATCH 2/4] Fix behavior when selecting create and edit process
permission
---
resources/views/admin/users/edit.blade.php | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php
index d1c31385fd..3b9ceac0b8 100644
--- a/resources/views/admin/users/edit.blade.php
+++ b/resources/views/admin/users/edit.blade.php
@@ -356,6 +356,8 @@
this.selectedPermissions.push(sibling);
}
Vue.set(this, 'selectedPermissions', this.selectedPermissions.filter((v, i, arr) => arr.indexOf(v) === i));
+
+ this.checkProcessCategoryView(sibling, self);
},
checkEdit(sibling, $event) {
let self = $event.target.value;
@@ -364,6 +366,22 @@
return el !== sibling;
});
}
+ if (sibling.includes('processes') || self.includes('processes')) {
+ this.checkProcessCategoryView(sibling, self);
+ }
+ Vue.set(this, 'selectedPermissions', this.selectedPermissions.filter((v, i, arr) => arr.indexOf(v) === i));
+ },
+ checkProcessCategoryView(sibling, self) {
+ const viewProcessCategoriesPermission = 'view-process-categories';
+ if (this.selectedPermissions.includes(self)) {
+ this.selectedPermissions.push(viewProcessCategoriesPermission);
+ }
+
+ if (!this.selectedPermissions.includes(self) && !this.selectedPermissions.includes(sibling)) {
+ this.selectedPermissions = this.selectedPermissions.filter(function (el) {
+ return el !== viewProcessCategoriesPermission;
+ });
+ }
Vue.set(this, 'selectedPermissions', this.selectedPermissions.filter((v, i, arr) => arr.indexOf(v) === i));
},
copyTextArea() {
From b9f7c543f52acb0b980f14c5a0eb4d8d17fc9ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Busso?=
<90727999+agustinbusso@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:15:23 -0300
Subject: [PATCH 3/4] Execute only for processes permissions
---
resources/views/admin/users/edit.blade.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php
index 3b9ceac0b8..533364b74a 100644
--- a/resources/views/admin/users/edit.blade.php
+++ b/resources/views/admin/users/edit.blade.php
@@ -357,7 +357,9 @@
}
Vue.set(this, 'selectedPermissions', this.selectedPermissions.filter((v, i, arr) => arr.indexOf(v) === i));
- this.checkProcessCategoryView(sibling, self);
+ if (sibling.includes('processes') || self.includes('processes')) {
+ this.checkProcessCategoryView(sibling, self);
+ }
},
checkEdit(sibling, $event) {
let self = $event.target.value;
From 418c6dad2ce23f6cf06649be5f4792bfa69f9c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Busso?=
<90727999+agustinbusso@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:17:19 -0300
Subject: [PATCH 4/4] Update order
---
resources/views/admin/users/edit.blade.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php
index 533364b74a..2c58d3ac7c 100644
--- a/resources/views/admin/users/edit.blade.php
+++ b/resources/views/admin/users/edit.blade.php
@@ -355,11 +355,10 @@
if (this.selectedPermissions.includes(self)) {
this.selectedPermissions.push(sibling);
}
- Vue.set(this, 'selectedPermissions', this.selectedPermissions.filter((v, i, arr) => arr.indexOf(v) === i));
-
if (sibling.includes('processes') || self.includes('processes')) {
this.checkProcessCategoryView(sibling, self);
}
+ Vue.set(this, 'selectedPermissions', this.selectedPermissions.filter((v, i, arr) => arr.indexOf(v) === i));
},
checkEdit(sibling, $event) {
let self = $event.target.value;