From 994d876ba30717b9d4a77f55106738909fcfb3e7 Mon Sep 17 00:00:00 2001 From: Samuel Weirich <4281791+SamuelWei@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:42:53 +0100 Subject: [PATCH 01/79] Fix multiselect buttons with rounded corners --- resources/sass/override/_multiselect.scss | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/sass/override/_multiselect.scss b/resources/sass/override/_multiselect.scss index 2a1dabee7..9021ee0d3 100644 --- a/resources/sass/override/_multiselect.scss +++ b/resources/sass/override/_multiselect.scss @@ -127,16 +127,20 @@ } .p-inputgroup > .multiselect .multiselect__tags { - border-radius: 0; + border-radius: 0 !important; margin: 0; } .p-inputgroup .multiselect:first-child .multiselect__tags { - border-top-left-radius: var(--p-inputgroup-addon-border-radius); - border-bottom-left-radius: var(--p-inputgroup-addon-border-radius); + border-top-left-radius: var(--p-inputgroup-addon-border-radius) !important; + border-bottom-left-radius: var( + --p-inputgroup-addon-border-radius + ) !important; } .p-inputgroup .multiselect:last-child .multiselect__tags { - border-top-right-radius: var(--p-inputgroup-addon-border-radius); - border-bottom-right-radius: var(--p-inputgroup-addon-border-radius); + border-top-right-radius: var(--p-inputgroup-addon-border-radius) !important; + border-bottom-right-radius: var( + --p-inputgroup-addon-border-radius + ) !important; } From 3f4a34e6cfcf0004fc292d144be259e0a0a87256 Mon Sep 17 00:00:00 2001 From: Samuel Weirich <4281791+SamuelWei@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:44:48 +0100 Subject: [PATCH 02/79] Fix frontend user view / edit permissions --- resources/js/policies/UserPolicy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/js/policies/UserPolicy.js b/resources/js/policies/UserPolicy.js index 8568eb694..a3c82234c 100644 --- a/resources/js/policies/UserPolicy.js +++ b/resources/js/policies/UserPolicy.js @@ -22,7 +22,7 @@ export default { view(user, model) { if (!user) { return false; - } else if (model.id === user.id) { + } else if (parseInt(model.id) === user.id) { return true; } @@ -49,7 +49,7 @@ export default { update(user, model) { if (!user) { return false; - } else if (model.id === user.id) { + } else if (parseInt(model.id) === user.id) { return true; } From 9fa0a66e79cccdd3514d43d314c6b07c1da2ad17 Mon Sep 17 00:00:00 2001 From: Samuel Weirich <4281791+SamuelWei@users.noreply.github.com> Date: Tue, 19 Nov 2024 17:46:31 +0100 Subject: [PATCH 03/79] Fix missing permissions for user index list --- database/seeders/RolesAndPermissionsSeeder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/seeders/RolesAndPermissionsSeeder.php b/database/seeders/RolesAndPermissionsSeeder.php index bd9b69786..6cabb5e76 100644 --- a/database/seeders/RolesAndPermissionsSeeder.php +++ b/database/seeders/RolesAndPermissionsSeeder.php @@ -104,7 +104,7 @@ public function run() Permission::setIncludedPermissions('users.create', ['users.updateOwnAttributes', 'users.update', 'users.view', 'users.viewAny', 'roles.viewAny', 'admin.view']); Permission::setIncludedPermissions('users.update', ['users.updateOwnAttributes', 'users.view', 'users.viewAny', 'roles.viewAny', 'admin.view']); Permission::setIncludedPermissions('users.view', ['users.viewAny', 'roles.viewAny', 'admin.view']); - Permission::setIncludedPermissions('users.viewAny', ['admin.view']); + Permission::setIncludedPermissions('users.viewAny', ['admin.view', 'roles.viewAny']); Permission::setIncludedPermissions('roomTypes.delete', ['roomTypes.create', 'roomTypes.update', 'roomTypes.view', 'serverPools.viewAny', 'admin.view', 'roles.viewAny']); Permission::setIncludedPermissions('roomTypes.create', ['roomTypes.update', 'roomTypes.view', 'serverPools.viewAny', 'admin.view', 'roles.viewAny']); From 85b31604835db70e657dd6b71919ba331960e0b9 Mon Sep 17 00:00:00 2001 From: Samuel Weirich <4281791+SamuelWei@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:16:01 +0100 Subject: [PATCH 04/79] Fix error handling --- resources/js/views/AdminUsersIndex.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/views/AdminUsersIndex.vue b/resources/js/views/AdminUsersIndex.vue index dbb324fc7..799968115 100644 --- a/resources/js/views/AdminUsersIndex.vue +++ b/resources/js/views/AdminUsersIndex.vue @@ -321,7 +321,7 @@ function loadRoles(page = 1) { .catch((error) => { rolesMultiselectRef.value.deactivate(); rolesLoadingError.value = true; - error(error, this.$root, error.message); + api.error(error); }) .finally(() => { rolesLoading.value = false; From ff1b818db307c07abe7c53c8052e10daf22ae508 Mon Sep 17 00:00:00 2001 From: Samuel Weirich <4281791+SamuelWei@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:22:44 +0100 Subject: [PATCH 05/79] Close multiselect dropdown on selection --- resources/js/views/AdminRoomTypesView.vue | 2 +- resources/js/views/AdminUsersIndex.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/js/views/AdminRoomTypesView.vue b/resources/js/views/AdminRoomTypesView.vue index 0e7366218..18c36d34a 100644 --- a/resources/js/views/AdminRoomTypesView.vue +++ b/resources/js/views/AdminRoomTypesView.vue @@ -135,7 +135,7 @@ :searchable="false" :internal-search="false" :clear-on-select="false" - :close-on-select="false" + :close-on-select="true" :show-no-results="false" :show-labels="false" :options="serverPools" diff --git a/resources/js/views/AdminUsersIndex.vue b/resources/js/views/AdminUsersIndex.vue index 799968115..b567e3b14 100644 --- a/resources/js/views/AdminUsersIndex.vue +++ b/resources/js/views/AdminUsersIndex.vue @@ -31,7 +31,7 @@ :searchable="false" :internal-search="false" :clear-on-select="false" - :close-on-select="false" + :close-on-select="true" :show-no-results="false" :show-labels="false" :options="roles" From 1785da1566d69f8189bb00551b6ba266159c1e85 Mon Sep 17 00:00:00 2001 From: Samuel Weirich <4281791+SamuelWei@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:49:54 +0100 Subject: [PATCH 06/79] Disable role select during loading --- resources/js/views/AdminUsersIndex.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/views/AdminUsersIndex.vue b/resources/js/views/AdminUsersIndex.vue index b567e3b14..caff61d87 100644 --- a/resources/js/views/AdminUsersIndex.vue +++ b/resources/js/views/AdminUsersIndex.vue @@ -35,7 +35,7 @@ :show-no-results="false" :show-labels="false" :options="roles" - :disabled="rolesLoadingError" + :disabled="rolesLoadingError || isBusy" :loading="rolesLoading" :allow-empty="true" @update:model-value="loadData(1)" From 77c5832a4aaeee9272c5fa2b4e8a6bb15d3d301a Mon Sep 17 00:00:00 2001 From: Samuel Weirich <4281791+SamuelWei@users.noreply.github.com> Date: Wed, 20 Nov 2024 18:05:08 +0100 Subject: [PATCH 07/79] Bugfix overlay reload buttons --- resources/js/views/AdminRolesView.vue | 2 +- resources/js/views/AdminRoomTypesView.vue | 2 +- resources/js/views/AdminServerPoolsView.vue | 2 +- resources/js/views/AdminServersView.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/js/views/AdminRolesView.vue b/resources/js/views/AdminRolesView.vue index ca1e5c063..3638fcb55 100644 --- a/resources/js/views/AdminRolesView.vue +++ b/resources/js/views/AdminRolesView.vue @@ -30,7 +30,7 @@ -