.

diff --git a/app/Field/CollectionList.php b/app/Field/CollectionList.php
index 047f8dc410992ba29f9c9014b9aeb00bb5a956de..38fdc6b9f8338b5bf10b0d10155dce531e1e94b1 100644 (file)
--- a/app/Field/CollectionList.php
+++ b/app/Field/CollectionList.php
@@ -10,14 +10,20 @@ class CollectionList extends SelectFromArrayMultiple
     public function getOptions()
     {
         $res = [];
-        $lists = \App\Models\CollectionList::where('created_ok','1')->get();
-        foreach (Collection::where('created_ok','1')->get() as $item) {
-            $res[$item->id] = $item->name . ' - ' . __('Liste principale');
+        $lists = \App\Models\CollectionList::where('created_ok', '1')->get();
+        foreach (Collection::where('created_ok', '1')->get() as $item) {
+            $thisLists = [];
             foreach ($lists as $list) {
                 if ($list->collection == $item->id) {
-                    $res[$item->id . '_' . $list->id] = $item->name . ' - ' . $list->name;
+                    $thisLists[$item->id . '_' . $list->id] = $item->name . ' - ' . $list->name;
                 }
             }
+            $res[$item->id] = $item->name;
+            if (count($thisLists)) {
+                $res[$item->id] .= ' - ' . __('Liste principale');
+                $res = array_merge($res, $thisLists);
+            }
+
         }
         return $res;
     }

diff --git a/app/Http/Controllers/Admin/ChordCrudController.php b/app/Http/Controllers/Admin/ChordCrudController.php
index 8d94ce8a0a0b572331c4dbe6437fbad316f9584f..34d8a8e9d4aea89ed94a5168ac83a42a540d4dc6 100644 (file)
--- a/app/Http/Controllers/Admin/ChordCrudController.php
+++ b/app/Http/Controllers/Admin/ChordCrudController.php
@@ -6,7 +6,7 @@ class ChordCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagic
 {
     use \Cubist\Backpack\Magic\Operations\CreateOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\CloneEditOperation;
-       use \Cubist\Backpack\Magic\Operations\UpdateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;

diff --git a/app/Http/Controllers/Admin/CollectionCrudController.php b/app/Http/Controllers/Admin/CollectionCrudController.php
index b41706a6dbbc2fa8e134bafcca055eb6d58cf671..cf8454801b441927797fd1780a10ed48e374931b 100644 (file)
--- a/app/Http/Controllers/Admin/CollectionCrudController.php
+++ b/app/Http/Controllers/Admin/CollectionCrudController.php
@@ -6,7 +6,7 @@ class CollectionCrudController extends \Cubist\Backpack\Magic\Controllers\Cubist
 {
     use \Cubist\Backpack\Magic\Operations\CreateOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\CloneEditOperation;
-       use \Cubist\Backpack\Magic\Operations\UpdateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;

diff --git a/app/Http/Controllers/Admin/CollectionListCrudController.php b/app/Http/Controllers/Admin/CollectionListCrudController.php
new file mode 100644 (file)
index 0000000..f66c2fa
--- /dev/null
+++ b/app/Http/Controllers/Admin/CollectionListCrudController.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class CollectionListCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
+{
+    use \Cubist\Backpack\Magic\Operations\CreateOperation;
+       use \Cubist\Backpack\Http\Controllers\Operations\CloneEditOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
+       use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
+       
+
+
+    /*
+       __('list')
+       __('lists')
+       */
+
+    protected $_modelNamespace = 'App\Models\CollectionList';
+    protected $_routeURL = 'collection_list';
+    protected $_singular = 'list';
+    protected $_plural = 'lists';
+    protected $_oneInstance= false;
+}

diff --git a/app/Http/Controllers/Admin/CrudController.php b/app/Http/Controllers/Admin/CrudController.php
index df975e63898e2c13cb63b6b9683e1561ea4fac5e..c348701d58f88710f089acdb69124294dd30a014 100644 (file)
--- a/app/Http/Controllers/Admin/CrudController.php
+++ b/app/Http/Controllers/Admin/CrudController.php
@@ -5,14 +5,13 @@ namespace App\Http\Controllers\Admin;
 class CrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
 {
     use \Cubist\Backpack\Magic\Operations\CreateOperation;
-       use \Cubist\Backpack\Magic\Operations\UpdateOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
-       
+
 
 
     /*

diff --git a/app/Http/Controllers/Admin/InstrumentCrudController.php b/app/Http/Controllers/Admin/InstrumentCrudController.php
index 2f80ac0173b3b7b67393c1075a0531554de704c1..5fddd2dccb513523c11b0a69ae54836cf59f9915 100644 (file)
--- a/app/Http/Controllers/Admin/InstrumentCrudController.php
+++ b/app/Http/Controllers/Admin/InstrumentCrudController.php
@@ -6,7 +6,7 @@ class InstrumentCrudController extends \Cubist\Backpack\Magic\Controllers\Cubist
 {
     use \Cubist\Backpack\Magic\Operations\CreateOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\CloneEditOperation;
-       use \Cubist\Backpack\Magic\Operations\UpdateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;

diff --git a/app/Http/Controllers/Admin/SongCrudController.php b/app/Http/Controllers/Admin/SongCrudController.php
index 6deb70d3448486629c2f0be98f961da28c6f991c..603bbcdad9590ca9099433d57f79d31bbb5d023a 100644 (file)
--- a/app/Http/Controllers/Admin/SongCrudController.php
+++ b/app/Http/Controllers/Admin/SongCrudController.php
@@ -4,12 +4,12 @@ namespace App\Http\Controllers\Admin;
 
 class SongCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
 {
-    use \App\Http\Controllers\Admin\Operations\Song\ImportOperation;
-       use \Cubist\Backpack\Magic\Operations\CreateOperation;
+    use \Cubist\Backpack\Magic\Operations\CreateOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\CloneEditOperation;
-       use \Cubist\Backpack\Magic\Operations\UpdateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
+       use \App\Http\Controllers\Admin\Operations\Song\ImportOperation;
        
 
 

diff --git a/app/Http/Controllers/Admin/TranslateCrudController.php b/app/Http/Controllers/Admin/TranslateCrudController.php
new file mode 100644 (file)
index 0000000..cc4001c
--- /dev/null
+++ b/app/Http/Controllers/Admin/TranslateCrudController.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class TranslateCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
+{
+    use \Cubist\Backpack\Magic\Operations\CreateOperation;
+       use \Cubist\Backpack\Http\Controllers\Operations\CloneEditOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
+       use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
+       
+
+
+    /*
+       __('traduction')
+       __('traductions')
+       */
+
+    protected $_modelNamespace = 'App\Models\Translate';
+    protected $_routeURL = 'translate';
+    protected $_singular = 'traduction';
+    protected $_plural = 'traductions';
+    protected $_oneInstance= true;
+}

diff --git a/app/Http/Controllers/Admin/UserCrudController.php b/app/Http/Controllers/Admin/UserCrudController.php
index f01fa3d1d6ee7d206f91bf19ac64f9bba1d49489..51c5984858537c4689e85c42ba43e93bbf122657 100644 (file)
--- a/app/Http/Controllers/Admin/UserCrudController.php
+++ b/app/Http/Controllers/Admin/UserCrudController.php
@@ -5,14 +5,13 @@ namespace App\Http\Controllers\Admin;
 class UserCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
 {
     use \Cubist\Backpack\Magic\Operations\CreateOperation;
-       use \Cubist\Backpack\Magic\Operations\UpdateOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
-       
+
 
 
     /*

diff --git a/app/Http/Controllers/Admin/UsersCrudController.php b/app/Http/Controllers/Admin/UsersCrudController.php
index 6aca850d634df3de339b24b1c3caebbfc596322f..fb6d634495b8a6030f71634a3a80106da74b7b9a 100644 (file)
--- a/app/Http/Controllers/Admin/UsersCrudController.php
+++ b/app/Http/Controllers/Admin/UsersCrudController.php
@@ -6,7 +6,7 @@ class UsersCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagic
 {
     use \Cubist\Backpack\Magic\Operations\CreateOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\CloneEditOperation;
-       use \Cubist\Backpack\Magic\Operations\UpdateOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;

diff --git a/app/Models/User.php b/app/Models/User.php
index cd3e319e615af7faf59405ddf90dbf457f576106..83ee9bf9588a14af9bd0f88a7cbb819db38a765e 100644 (file)
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -17,6 +17,7 @@ class User extends CubistMagicAuthenticatable
     {
         parent::setFields();
 
-        $this->addField('name','Text','Name');
+        $this->addField('name', 'Text', 'Name');
+        $this->addField('collections', \App\Field\CollectionList::class, 'Collections');
     }
 }

diff --git a/webpack.mix.js b/webpack.mix.js
index c242eb70ddf06a1f02bed2b5f6b3f91af5c59af2..2650a6053cf8f535b96382c0db6236dff578fbc7 100644 (file)
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -26,9 +26,7 @@ mix.js('resources/js/app.js', 'public/js')
             cacheName: 'images', matchOptions: {ignoreVary: true},
         },
     }, {
-        urlPattern: /^https:\/\/songbook.enhydra.fr\/(css|js|fonts)\/(.*)$/,
-        handler: 'CacheFirst',
-        options: {
+        urlPattern: /^https:\/\/songbook.enhydra.fr\/(css|js|fonts)\/(.*)$/, handler: 'CacheFirst', options: {
             cacheName: 'scripts', matchOptions: {ignoreVary: true},
         },
     }, {
@@ -37,13 +35,13 @@ mix.js('resources/js/app.js', 'public/js')
         },
     }, {
         urlPattern: /^https:\/\/songbook.enhydra.fr\/([^\.]*)$/, handler: 'NetworkFirst', options: {
-            cacheName: 'home', matchOptions: {ignoreVary: true},
+            cacheName: 'home', matchOptions: {ignoreVary: true}, networkTimeoutSeconds: 3,
         },
     }, {
         urlPattern: /^https:\/\/songbook.enhydra.fr\/(.*).html$/,
         handler: /*'StaleWhileRevalidate'*/"NetworkFirst",
         options: {
-            cacheName: 'songs', matchOptions: {ignoreVary: true},
+            cacheName: 'songs', matchOptions: {ignoreVary: true}, networkTimeoutSeconds: 3,
         },
     },], skipWaiting: true,
 }).version();