Merge pull request #210 from SlovakNationalGallery/fix/KOMARCH-298

Fix/komarch 298
SlovakNationalGallery · Feb 15, 2024 · ee85065 · ee85065
2 parents f871887 + fbaabff
commit ee85065
Show file tree

Hide file tree

Showing 6 changed files with 325 additions and 210 deletions.
diff --git a/app/Http/Controllers/Admin/DocumentCrudController.php b/app/Http/Controllers/Admin/DocumentCrudController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Models\Tag;
 use App\Http\Requests\DocumentRequest;
 use Backpack\CRUD\app\Http\Controllers\CrudController;
 use Backpack\CRUD\app\Library\CrudPanel\CrudPanelFacade as CRUD;
@@ -120,41 +121,35 @@ protected function setupCreateOperation()
             [
                 'name'        => 'types',
                 'type'        => 'select2_multiple_tags',
-                'entity'      => 'types',
+                'entity'      => false,
                 'attribute'   => 'name',
                 'fake'     => true,
                 'attributes' => [
                     'data-tags' => true
                 ],
-                'options'   => (function ($query) {
-                    return $query->where('type', 'document-type')->get();
-                }),
+                'options'   => Tag::where('type', 'document-type')->get(),
             ],
             [
                 'name'        => 'topics',
                 'type'        => 'select2_multiple_tags',
-                'entity'      => 'topics',
+                'entity'      => false,
                 'attribute'   => 'name',
                 'fake'     => true,
                 'attributes' => [
                     'data-tags' => true
                 ],
-                'options'   => (function ($query) {
-                    return $query->where('type', 'document-topic')->get();
-                }),
+                'options'   => Tag::where('type', 'document-topic')->get(),
             ],
             [
                 'name'        => 'roles',
                 'type'        => 'select2_multiple_tags',
-                'entity'      => 'roles',
+                'entity'      => false,
                 'attribute'   => 'name',
                 'fake'     => true,
                 'attributes' => [
                     'data-tags' => true
                 ],
-                'options'   => (function ($query) {
-                    return $query->where('type', 'document-role')->get();
-                }),
+                'options'   => Tag::where('type', 'document-role')->get(),
             ],
         ]);
 

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -25,6 +25,10 @@ public function register()
      */
     public function boot()
     {
+        if (config('app.locale') === 'sk') {
+            setlocale(LC_ALL, 'sk_SK.UTF-8');
+        }
+
         Paginator::useBootstrap();
 
         Blade::directive('date_localized', function ($expression) {

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "laravel/scout": "^9.0",
         "laravel/telescope": "^4.3",
         "laravel/tinker": "^2.8",
-        "league/flysystem-sftp": "^3.0",
+        "league/flysystem-sftp-v3": "^3.0",
         "mcamara/laravel-localization": "^1.6",
         "sentry/sentry-laravel": "^3.3",
         "spatie/laravel-medialibrary": "^11.0",
@@ -33,12 +33,12 @@
         "spatie/laravel-tags": "^4.5",
         "spatie/laravel-translatable": "^6.5",
         "spatie/pdf-to-image": "^2.1",
-        "staudenmeir/eloquent-has-many-deep": "^1.13"
+        "staudenmeir/eloquent-has-many-deep": "^1.13",
+        "fakerphp/faker": "^1.9.1"
     },
     "require-dev": {
         "backpack/generators": "^4.0",
         "deployer/deployer": "^7.3",
-        "fakerphp/faker": "^1.9.1",
         "laravel/pint": "^1.0",
         "laravel/sail": "^1.18",
         "mockery/mockery": "^1.4.4",