Fixed a bug when adding permission by ability slug

deltoss · Apr 17, 2020 · 847b629 · 847b629
1 parent 69e1541
commit 847b629
Show file tree

Hide file tree

Showing 43 changed files with 9 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/composer.json b/composer.json
diff --git a/docs/.nojekyll b/docs/.nojekyll
diff --git a/docs/README.md b/docs/README.md
diff --git a/docs/api.md b/docs/api.md
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/usage.md b/docs/usage.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/phpunit.xml b/phpunit.xml
diff --git a/publishable/config/sentinel.database.permissions.php b/publishable/config/sentinel.database.permissions.php
diff --git a/publishable/database/migrations/2018_03_18_100612_drop_unused_sentinel_permissions.php b/publishable/database/migrations/2018_03_18_100612_drop_unused_sentinel_permissions.php
diff --git a/publishable/database/migrations/2018_03_18_104020_create_custom_ability_categories_table.php b/publishable/database/migrations/2018_03_18_104020_create_custom_ability_categories_table.php
diff --git a/publishable/database/migrations/2018_03_18_104024_create_custom_abilities_table.php b/publishable/database/migrations/2018_03_18_104024_create_custom_abilities_table.php
diff --git a/publishable/database/migrations/2018_03_18_104610_create_user_permissions_table.php b/publishable/database/migrations/2018_03_18_104610_create_user_permissions_table.php
diff --git a/publishable/database/migrations/2018_03_18_104611_create_role_permissions_table.php b/publishable/database/migrations/2018_03_18_104611_create_role_permissions_table.php
diff --git a/src/Abilities/AbilityInterface.php b/src/Abilities/AbilityInterface.php
diff --git a/src/Abilities/AbilityRepositoryInterface.php b/src/Abilities/AbilityRepositoryInterface.php
diff --git a/src/Abilities/EloquentAbility.php b/src/Abilities/EloquentAbility.php
diff --git a/src/Abilities/IlluminateAbilityRepository.php b/src/Abilities/IlluminateAbilityRepository.php
diff --git a/src/AbilityCategories/AbilityCategoryInterface.php b/src/AbilityCategories/AbilityCategoryInterface.php
diff --git a/src/AbilityCategories/AbilityCategoryRepositoryInterface.php b/src/AbilityCategories/AbilityCategoryRepositoryInterface.php
diff --git a/src/AbilityCategories/EloquentAbilityCategory.php b/src/AbilityCategories/EloquentAbilityCategory.php
diff --git a/src/AbilityCategories/IlluminateAbilityCategoryRepository.php b/src/AbilityCategories/IlluminateAbilityCategoryRepository.php
diff --git a/src/ExtendedSentinel.php b/src/ExtendedSentinel.php
diff --git a/src/Permissions/ExtendedStandardPermissions.php b/src/Permissions/ExtendedStandardPermissions.php
diff --git a/src/Permissions/ExtendedStrictPermissions.php b/src/Permissions/ExtendedStrictPermissions.php
diff --git a/src/Providers/SentinelDatabasePermissionsServiceProvider.php b/src/Providers/SentinelDatabasePermissionsServiceProvider.php
diff --git a/src/Roles/ExtendedRole.php b/src/Roles/ExtendedRole.php
diff --git a/src/Traits/DatabasePermissibleTrait.php b/src/Traits/DatabasePermissibleTrait.php
@@ -156,7 +156,15 @@ protected function getAbility($ability)
     {
         if (!($ability instanceof AbilityInterface))
         {
-            $ability = static::getAbilitiesModel()::where('id', $ability)->orWhere('slug', $ability)->first();
+            $ability = static::getAbilitiesModel()::when(
+                \is_numeric($ability), 
+                function($query) use ($ability) {
+                    $query->where('id', $ability);
+                }, 
+                function($query) use ($ability) {
+                    $query->where('slug', $ability);
+                }
+            )->first();
         }
         return $ability;
     }

diff --git a/src/Traits/DatabasePermissionsTrait.php b/src/Traits/DatabasePermissionsTrait.php
diff --git a/src/Users/ExtendedUser.php b/src/Users/ExtendedUser.php
diff --git a/tests/DatabaseTestCase.php b/tests/DatabaseTestCase.php
diff --git a/tests/ModelOverrideTest.php b/tests/ModelOverrideTest.php
diff --git a/tests/PermissionTest.php b/tests/PermissionTest.php
diff --git a/tests/RoleTest.php b/tests/RoleTest.php
diff --git a/tests/SentinelTest.php b/tests/SentinelTest.php
diff --git a/tests/UserPermissibleTraitTest.php b/tests/UserPermissibleTraitTest.php
diff --git a/tests/UserTest.php b/tests/UserTest.php