diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php index efc56f1..e3c0d38 100644 --- a/app/Policies/UserPolicy.php +++ b/app/Policies/UserPolicy.php @@ -90,7 +90,7 @@ class UserPolicy * * @param \App\Models\User $authUser * @param \App\Models\User $user - * @return booleanean + * @return boolean */ public function forceDelete(User $authUser, User $user): bool { @@ -104,7 +104,7 @@ class UserPolicy * * @param \App\Models\User $authUser * @param \App\Models\User $user - * @return booleanean + * @return boolean */ public function duplicate(User $authUser, User $user): bool { @@ -118,7 +118,7 @@ class UserPolicy * * @param \App\Models\User $authUser * @param \App\Models\User $user - * @return booleanean + * @return boolean */ public function changePublished(User $authUser, User $user): bool { diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 13c7912..612e0a9 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -21,7 +21,7 @@ return new class extends Migration $table->timestamp('email_verified_at')->nullable(); $table->string('password')->comment('Password of the user account.'); $table->rememberToken(); - $table->boolean('role')->comment('Role of the user who defines the rights/access.'); + $table->unsignedTinyInteger('role')->comment('Role of the user who defines the rights/access.'); $table->boolean('published')->comment('The user is acivated or not.'); $table->timestamp('published_at')->nullable()->comment('The date on which the user was acivated.'); $table->timestamps(); diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php index e145051..111fcc0 100644 --- a/resources/lang/fr/validation.php +++ b/resources/lang/fr/validation.php @@ -217,7 +217,7 @@ return [ 'custom' => [ 'event' => 'évènement', 'model' => 'élément ciblé', - 'order' => 'order', + 'order' => 'ordre', 'publication' => 'publication', 'activated' => 'activé', 'target' => 'cible', diff --git a/resources/sass/bo/vendor/_bootstrap.scss b/resources/sass/bo/vendor/_bootstrap.scss index 4d6e2dc..bb2a3a8 100644 --- a/resources/sass/bo/vendor/_bootstrap.scss +++ b/resources/sass/bo/vendor/_bootstrap.scss @@ -33,6 +33,7 @@ @import "bootstrap/scss/transitions"; @import "bootstrap/scss/type"; @import "bootstrap/scss/utilities"; +@import "bootstrap/scss/modal"; @import "bootstrap/scss/close"; @import "bootstrap/scss/card"; @import "bootstrap/scss/breadcrumb"; diff --git a/resources/views/bo/layouts/nav-list.blade.php b/resources/views/bo/layouts/nav-list.blade.php index d4327a9..00dca40 100644 --- a/resources/views/bo/layouts/nav-list.blade.php +++ b/resources/views/bo/layouts/nav-list.blade.php @@ -27,7 +27,7 @@
  • + title="{{ __('crud.helpers.list_all', ['model' => trans_choice('models.classes.activity_log', '*')]) }}"> {{ Str::of(trans_choice('models.classes.activity_log', '*'))->ucfirst() }}
  • diff --git a/resources/views/bo/modules/change-model-order.blade.php b/resources/views/bo/modules/change-model-order.blade.php index dc977ca..a76ed7c 100644 --- a/resources/views/bo/modules/change-model-order.blade.php +++ b/resources/views/bo/modules/change-model-order.blade.php @@ -1,20 +1,28 @@ @can('changeOrder', $model)
    -
    @else diff --git a/resources/views/bo/modules/change-published-status.blade.php b/resources/views/bo/modules/change-published-status.blade.php index 0fc1c2b..3322e5a 100644 --- a/resources/views/bo/modules/change-published-status.blade.php +++ b/resources/views/bo/modules/change-published-status.blade.php @@ -2,6 +2,7 @@ @can('changePublished', $model)
    @csrf + @method('PATCH')