diff --git a/app/Http/Controllers/Bo/AppUserController.php b/app/Http/Controllers/Bo/AppUserController.php index 8214d22..87b3d2b 100644 --- a/app/Http/Controllers/Bo/AppUserController.php +++ b/app/Http/Controllers/Bo/AppUserController.php @@ -103,7 +103,7 @@ class AppUserController extends Controller */ public function edit(AppUser $app_user) { - $directories = Directory::renderDirectories(Directory::where('needAuthorization', 1) + $directories = Directory::renderDirectories(Directory::query()->where('needAuthorization', 1) ->orderBy('name', 'ASC')->get()); $app_user->directories = Directory::renderDirectories($app_user->directories); diff --git a/app/Http/Controllers/Bo/DirectoriesController.php b/app/Http/Controllers/Bo/DirectoriesController.php index 682499a..ae385df 100644 --- a/app/Http/Controllers/Bo/DirectoriesController.php +++ b/app/Http/Controllers/Bo/DirectoriesController.php @@ -6,9 +6,11 @@ use App\Http\Controllers\Controller; use App\Http\Requests\Bo\Directories\StoreDirectoryRequest; use App\Http\Requests\Bo\Directories\UpdateDirectoryRequest; use App\Models\Directory; +use App\Models\Document; use App\Models\Setting; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Gate; use Illuminate\Support\Str; class DirectoriesController extends Controller @@ -20,7 +22,7 @@ class DirectoriesController extends Controller */ public function index() { - $directories = Directory::orderBy('order', 'ASC')->get(); + $directories = $this->getDirectoriesForComponent(); return \view('bo.pages.directories.index', \compact('directories')); } @@ -61,6 +63,7 @@ class DirectoriesController extends Controller */ public function edit(Directory $directory) { + $this->authorize('edit', $directory); return view('bo.pages.directories.edit', ['directoryModel' => $directory]); } @@ -73,6 +76,7 @@ class DirectoriesController extends Controller */ public function update(UpdateDirectoryRequest $request, Directory $directory) { + $this->authorize('edit', $directory); return DB::transaction(function () use ($request, $directory) { $directory->fill($request->validated()); @@ -101,28 +105,39 @@ class DirectoriesController extends Controller */ public function destroy(Directory $directory) { - foreach ($directory->children as $directoryChild) { - $directoryChild->directory_id = null; - $directoryChild->saveOrFail(); - } - $buttons = Setting::where('key', 'Button1')->orWhere('key', 'Button2')->orWhere('key', 'Button3')->get(); - foreach ($buttons as $button) { - if (isset($button->value) && intval($button->value) === $directory->id) { - return [ - $button->id => trans( - ':model :name n\'a pas été supprimé, - un bouton est encore associé à ce dernier dans les paramètres :', - [ - 'model' => Str::singular(trans('models.classes.directories')), - 'name' => $directory->name['fr'] - ] - ) - ]; + $this->authorize('delete', $directory); + return DB::transaction(function () use ($directory) { + foreach ($directory->children as $directoryChild) { + $directoryChild->directory_id = null; + $directoryChild->saveOrFail(); } - } - if ($directory->deleteOrFail()) { - return Directory::orderBy('order', 'ASC')->get(); - } + /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Document> */ + $documents = $directory->documents()->get()->sortBy('lang', \SORT_REGULAR, true); + if ($documents->count()) { + $documents->each(function (Document $document) { + $document->deleteOrFail(); + }); + } + /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Setting> */ + $buttons = Setting::query()->whereIn('key', ['Button1', 'Button2', 'Button3'])->get(); + foreach ($buttons as $button) { + if (isset($button->value) && intval($button->value) === $directory->id) { + return [ + $button->id => trans( + ':model :name n\'a pas été supprimé, + un bouton est encore associé à ce dernier dans les paramètres :', + [ + 'model' => Str::singular(trans('models.classes.directories')), + 'name' => $directory->name['fr'] + ] + ) + ]; + } + } + if ($directory->deleteOrFail()) { + return $this->getDirectoriesForComponent(); + } + }); } /** @@ -171,4 +186,16 @@ class DirectoriesController extends Controller return $directory; } } + + /** + * Get directories for component + * + * @return \Illuminate\Database\Eloquent\Collection + */ + private function getDirectoriesForComponent() + { + return Directory::query() + ->withCount('documents') + ->orderBy('order', 'ASC')->get(); + } } diff --git a/app/Http/Requests/Bo/Directories/StoreDirectoryRequest.php b/app/Http/Requests/Bo/Directories/StoreDirectoryRequest.php index 46ba82a..85672fc 100644 --- a/app/Http/Requests/Bo/Directories/StoreDirectoryRequest.php +++ b/app/Http/Requests/Bo/Directories/StoreDirectoryRequest.php @@ -2,6 +2,7 @@ namespace App\Http\Requests\Bo\Directories; +use App\Enums\Documents\LangEnum; use Illuminate\Foundation\Http\FormRequest; class StoreDirectoryRequest extends FormRequest @@ -49,9 +50,16 @@ class StoreDirectoryRequest extends FormRequest */ public function attributes() { - return [ + $rules = [ 'name' => \trans('nom du dossier'), 'needAuthorization' => \trans('autorisation du dossier') ]; + foreach (LangEnum::toArray() as $langEnum) { + $def = $langEnum->getDefinition(); + $rules["name.{$def}"] = \trans('nom du dossier :lang', [ + 'lang' => $langEnum->label + ]); + } + return $rules; } } diff --git a/app/Models/Directory.php b/app/Models/Directory.php index 28bf723..2ef9d23 100644 --- a/app/Models/Directory.php +++ b/app/Models/Directory.php @@ -140,7 +140,7 @@ class Directory extends Model */ public function parent() { - return $this->belongsTo('App\Models\Directory', 'directory_id'); + return $this->belongsTo(Directory::class, 'directory_id'); } /** @@ -150,7 +150,7 @@ class Directory extends Model */ public function children() { - return $this->hasMany('App\Models\Directory', 'directory_id'); + return $this->hasMany(Directory::class, 'directory_id'); } /** @@ -170,6 +170,6 @@ class Directory extends Model */ public function documents() { - return $this->hasMany('App\Models\Document', 'directory_id'); + return $this->hasMany(Document::class, 'directory_id'); } } diff --git a/app/Models/Document.php b/app/Models/Document.php index 6452ca6..d3a38ac 100644 --- a/app/Models/Document.php +++ b/app/Models/Document.php @@ -119,7 +119,7 @@ class Document extends Model */ public static function removeDocument(Model $model): void { - $path = \ltrim(\urldecode("storage/docs/" . $model->uuid . $model->type), '/'); + $path = \ltrim(\urldecode("storage/docs/{$model->uuid}.{$model->type}"), '/'); if (\strpos($path, 'storage') !== 0) { return; } @@ -138,7 +138,7 @@ class Document extends Model */ public function directory() { - return $this->belongsTo('App\Models\Directory', 'directory_id'); + return $this->belongsTo(Directory::class, 'directory_id'); } /** @@ -148,7 +148,7 @@ class Document extends Model */ public function parentDocument() { - return $this->belongsTo('App\Models\Document', 'document_id'); + return $this->belongsTo(Document::class, 'document_id'); } /** @@ -158,7 +158,7 @@ class Document extends Model */ public function children() { - return $this->hasMany('App\Models\Document', 'document_id'); + return $this->hasMany(Document::class, 'document_id'); } /** diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 9453961..2173f91 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -18,7 +18,7 @@ class AppServiceProvider extends ServiceProvider public function boot() { // * HTTPS FIX - //URL::forceScheme('http'); + URL::forceScheme('https'); // * HA PROXY FIX App::singleton('clientIp', function () { if (config('app.env') === 'local') { diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index a9dc7c3..ac76c89 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -2,7 +2,10 @@ namespace App\Providers; +use App\Models\Directory; +use App\Models\User; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Gate; class AuthServiceProvider extends ServiceProvider { @@ -14,5 +17,14 @@ class AuthServiceProvider extends ServiceProvider public function boot() { $this->registerPolicies(); + + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed + Gate::define('edit', function (User $user, Directory $directory) { + return !$directory->is_system; + }); + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed + Gate::define('delete', function (User $user, Directory $directory) { + return !$directory->is_system; + }); } } diff --git a/resources/sass/bo/bo.scss b/resources/sass/bo/bo.scss index 56578bf..c7499d5 100644 --- a/resources/sass/bo/bo.scss +++ b/resources/sass/bo/bo.scss @@ -1,4 +1,5 @@ @charset "UTF-8"; +@import "~toastify-js/src/toastify.css"; // * UTILITIES @import "./utilities/variables"; diff --git a/resources/ts/bo/components/BelongsToManyDropdownComponent.vue b/resources/ts/bo/components/BelongsToManyDropdownComponent.vue index 0f70e30..1fc6d3e 100644 --- a/resources/ts/bo/components/BelongsToManyDropdownComponent.vue +++ b/resources/ts/bo/components/BelongsToManyDropdownComponent.vue @@ -63,15 +63,16 @@ diff --git a/resources/ts/bo/components/FormulariesSelectInputComponent.vue b/resources/ts/bo/components/FormulariesSelectInputComponent.vue index e85dae3..90b5c6d 100644 --- a/resources/ts/bo/components/FormulariesSelectInputComponent.vue +++ b/resources/ts/bo/components/FormulariesSelectInputComponent.vue @@ -232,6 +232,7 @@ import ListItemComponent from "./ListItemComponent.vue"; import WordCounter from "./WordCounterComponent.vue"; export default defineComponent({ + name: "FormulariesSelectInputComponent", mixins: [trans, parseLaravelErrorMessages], components: { FormulariesSwitchComponent, diff --git a/resources/ts/bo/components/FormulariesSwitchComponent.vue b/resources/ts/bo/components/FormulariesSwitchComponent.vue index eb2a545..f7068e5 100644 --- a/resources/ts/bo/components/FormulariesSwitchComponent.vue +++ b/resources/ts/bo/components/FormulariesSwitchComponent.vue @@ -60,6 +60,7 @@ import { defineComponent, PropType } from "vue"; import trans from "../../modules/trans"; export default defineComponent({ + name: "FormulariesSwitchComponent", mixins: [trans], props: { id: { diff --git a/resources/ts/bo/components/ImageInputComponent.vue b/resources/ts/bo/components/ImageInputComponent.vue index 8ad6f7e..2cf6ddb 100644 --- a/resources/ts/bo/components/ImageInputComponent.vue +++ b/resources/ts/bo/components/ImageInputComponent.vue @@ -398,10 +398,10 @@ + submitClone.addEventListener('click', (event) => { + event.preventDefault(); + submit.click(''); + }) + }); + @endpush diff --git a/resources/views/bo/partials/inputs/varchar-password.blade.php b/resources/views/bo/partials/inputs/varchar-password.blade.php index 7d1c775..9cf8b0f 100644 --- a/resources/views/bo/partials/inputs/varchar-password.blade.php +++ b/resources/views/bo/partials/inputs/varchar-password.blade.php @@ -1,29 +1,26 @@ -@if(!empty($label)) - +@if (!empty($label)) + @endif -@if(!empty($hasWordCounter ?? false)) -
"$id"])'>
+@if (!empty($hasWordCounter ?? false)) +
"$id"])'>
@endif
- + @php $dataPassword = ['inputId' => $id]; @endphp -
@include('modules.input-error', [ 'inputName' => $name, 'helperId' => $id . 'Help', - 'helper' => $helper + 'helper' => $helper, ])