wip #3753 @0.25

diff --git a/app/Http/Controllers/Admin/CompanyCrudController.php b/app/Http/Controllers/Admin/CompanyCrudController.php
index f979612afca3bd024ba757e279db00a245f11654..08ed7bdfaab4d7825f5c62c5edf5f9c1f8bb7d33 100644 (file)
--- a/app/Http/Controllers/Admin/CompanyCrudController.php
+++ b/app/Http/Controllers/Admin/CompanyCrudController.php
@@ -15,6 +15,11 @@ class CompanyCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMag
        
 
 
+    /*
+       __('company')
+       __('companies')
+       */
+
     protected $_modelNamespace = 'App\Models\Company';
     protected $_routeURL = 'company';
     protected $_singular = 'company';

diff --git a/app/Http/Controllers/Admin/FluidbookQuoteCrudController.php b/app/Http/Controllers/Admin/FluidbookQuoteCrudController.php
index ab56599c548dc2567abe15efb334cb63c5fdb4af..5f4627faccc5e63db3b1188cc5a384f5fa1a42e6 100644 (file)
--- a/app/Http/Controllers/Admin/FluidbookQuoteCrudController.php
+++ b/app/Http/Controllers/Admin/FluidbookQuoteCrudController.php
@@ -14,6 +14,11 @@ class FluidbookQuoteCrudController extends \Cubist\Backpack\Magic\Controllers\Cu
        
 
 
+    /*
+       __('demande de devis')
+       __('demandes de devis')
+       */
+
     protected $_modelNamespace = 'App\Models\FluidbookQuote';
     protected $_routeURL = 'fluidbook-quote';
     protected $_singular = 'demande de devis';

diff --git a/app/Http/Controllers/Admin/LocaleCrudController.php b/app/Http/Controllers/Admin/LocaleCrudController.php
index 83f8be311a3b023e58eba131928e9b9bb0030898..d62b0ec7eff77572da686959975516aefbcbf265 100644 (file)
--- a/app/Http/Controllers/Admin/LocaleCrudController.php
+++ b/app/Http/Controllers/Admin/LocaleCrudController.php
@@ -15,6 +15,11 @@ class LocaleCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagi
        
 
 
+    /*
+       __('langue')
+       __('langues')
+       */
+
     protected $_modelNamespace = 'App\Models\Locale';
     protected $_routeURL = 'locale';
     protected $_singular = 'langue';

diff --git a/app/Http/Controllers/Admin/QuizCrudController.php b/app/Http/Controllers/Admin/QuizCrudController.php
index d3ae4c47774d08dc1904adc1adaf6eec67618756..3967888044dc8e9fa2bb0d300f635be2ae96c606 100644 (file)
--- a/app/Http/Controllers/Admin/QuizCrudController.php
+++ b/app/Http/Controllers/Admin/QuizCrudController.php
@@ -15,6 +15,11 @@ class QuizCrudController extends \App\Http\Controllers\Admin\Base\QuizController
        
 
 
+    /*
+       __('quiz')
+       __('quizzes')
+       */
+
     protected $_modelNamespace = 'App\Models\Quiz';
     protected $_routeURL = 'quiz';
     protected $_singular = 'quiz';

diff --git a/app/Http/Controllers/Admin/QuizatttemptCrudController.php b/app/Http/Controllers/Admin/QuizatttemptCrudController.php
index 9797e2cd24188655c522220087c8cf9a5aed1a5d..1dcf09956bee8dd4102291bc20f0f86ae5bd6ed5 100644 (file)
--- a/app/Http/Controllers/Admin/QuizatttemptCrudController.php
+++ b/app/Http/Controllers/Admin/QuizatttemptCrudController.php
@@ -12,10 +12,17 @@ class QuizatttemptCrudController extends \Cubist\Backpack\Magic\Controllers\Cubi
        use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
+       
+
+
+    /*
+       __('tentative de quiz')
+       __('tentatives de quiz')
+       */
 
     protected $_modelNamespace = 'App\Models\QuizAttempt';
     protected $_routeURL = 'quizatttempt';
-    protected $_singular = 'quiz attempt';
-    protected $_plural = 'quiz attempts';
+    protected $_singular = 'tentative de quiz';
+    protected $_plural = 'tentatives de quiz';
     protected $_oneInstance= false;
 }

diff --git a/app/Http/Controllers/Admin/QuiztranslationCrudController.php b/app/Http/Controllers/Admin/QuiztranslationCrudController.php
index c7f36b16a89d45ee8001499dbf5acddc9f3d0141..733aed81a457e44b15f61fd035ed1802f3b30f6f 100644 (file)
--- a/app/Http/Controllers/Admin/QuiztranslationCrudController.php
+++ b/app/Http/Controllers/Admin/QuiztranslationCrudController.php
@@ -12,10 +12,17 @@ class QuiztranslationCrudController extends \Cubist\Backpack\Magic\Controllers\C
        use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
+       
+
+
+    /*
+       __('traduction de quiz')
+       __('traductions de quiz')
+       */
 
     protected $_modelNamespace = 'App\Models\QuizTranslation';
     protected $_routeURL = 'quiztranslation';
-    protected $_singular = 'quiz translation';
-    protected $_plural = 'quiz translations';
+    protected $_singular = 'traduction de quiz';
+    protected $_plural = 'traductions de quiz';
     protected $_oneInstance= false;
 }

diff --git a/app/Http/Controllers/Admin/SettingsCrudController.php b/app/Http/Controllers/Admin/SettingsCrudController.php
index f22c30ce0e086bd4e66b778f4b483b389eb985d6..9288456b05e4008ef242b1b2166126177f1eab7e 100644 (file)
--- a/app/Http/Controllers/Admin/SettingsCrudController.php
+++ b/app/Http/Controllers/Admin/SettingsCrudController.php
@@ -15,6 +15,11 @@ class SettingsCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMa
        
 
 
+    /*
+       __('paramètre')
+       __('paramètres')
+       */
+
     protected $_modelNamespace = 'App\Models\Settings';
     protected $_routeURL = 'settings';
     protected $_singular = 'paramètre';

diff --git a/app/Http/Controllers/Admin/SignatureCrudController.php b/app/Http/Controllers/Admin/SignatureCrudController.php
index cc4b7f1cb5269063ab2092b7a5a1ea81bb25afba..f84e1e27ed773d57fbbb34313d15d0a35d207df9 100644 (file)
--- a/app/Http/Controllers/Admin/SignatureCrudController.php
+++ b/app/Http/Controllers/Admin/SignatureCrudController.php
@@ -15,6 +15,11 @@ class SignatureCrudController extends \Cubist\Backpack\Magic\Controllers\CubistM
        
 
 
+    /*
+       __('signature')
+       __('signatures')
+       */
+
     protected $_modelNamespace = 'App\Models\Signature';
     protected $_routeURL = 'signature';
     protected $_singular = 'signature';

diff --git a/app/Http/Controllers/Admin/ToolboxTranslateCrudController.php b/app/Http/Controllers/Admin/ToolboxTranslateCrudController.php
index b85e72332100a8521db1919dc2b2f01230fd3f47..e9d998e7115aa4ae943b8f07dfe650b0f374c453 100644 (file)
--- a/app/Http/Controllers/Admin/ToolboxTranslateCrudController.php
+++ b/app/Http/Controllers/Admin/ToolboxTranslateCrudController.php
@@ -15,6 +15,11 @@ class ToolboxTranslateCrudController extends \Cubist\Backpack\Magic\Controllers\
        
 
 
+    /*
+       __('traduction')
+       __('traductions')
+       */
+
     protected $_modelNamespace = 'App\Models\ToolboxTranslate';
     protected $_routeURL = 'toolbox-translate';
     protected $_singular = 'traduction';

diff --git a/app/Http/Controllers/Admin/UsersCrudController.php b/app/Http/Controllers/Admin/UsersCrudController.php
index 82ddd183bc70c1fa35ee83b2742acb7393979ef6..fa57865c0f367eb74e49f2fba3b03180917bc26c 100644 (file)
--- a/app/Http/Controllers/Admin/UsersCrudController.php
+++ b/app/Http/Controllers/Admin/UsersCrudController.php
@@ -16,6 +16,11 @@ class UsersCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagic
        
 
 
+    /*
+       __('user')
+       __('users')
+       */
+
     protected $_modelNamespace = 'App\Models\User';
     protected $_routeURL = 'users';
     protected $_singular = 'user';

diff --git a/app/Models/QuizAttempt.php b/app/Models/QuizAttempt.php
index 028a0e3af5b97c4d4fd8d04548efa44019254cb4..6a6153e4254b135d1c0663ae39cd7d3b3cb05104 100644 (file)
--- a/app/Models/QuizAttempt.php
+++ b/app/Models/QuizAttempt.php
@@ -8,8 +8,8 @@ class QuizAttempt extends CubistMagicAbstractModel
 {
     protected $table = 'quiz_attempt';
     protected $_options = ['name' => 'quizatttempt',
-        'singular' => 'quiz attempt',
-        'plural' => 'quiz attempts'];
+        'singular' => 'tentative de quiz',
+        'plural' => 'tentatives de quiz'];
 
     public function setFields()
     {

diff --git a/app/Models/QuizTranslation.php b/app/Models/QuizTranslation.php
index 08b80233a26929e6a4e57e35acd023f3240d6360..58c6f252e11fe830376e6db50636638a52327368 100644 (file)
--- a/app/Models/QuizTranslation.php
+++ b/app/Models/QuizTranslation.php
@@ -8,8 +8,8 @@ class QuizTranslation extends CubistMagicAbstractModel
 {
     protected $table = 'quiz_translation';
     protected $_options = ['name' => 'quiztranslation',
-        'singular' => 'quiz translation',
-        'plural' => 'quiz translations'];
+        'singular' => 'traduction de quiz',
+        'plural' => 'traductions de quiz'];
 
     public function setFields()
     {

diff --git a/app/Models/ToolboxTranslate.php b/app/Models/ToolboxTranslate.php
index dc92dbf3c037e3076d1f7dbd3d26db64e0a75fd2..06fb054390e359b0e21a29c465129ce1be585366 100644 (file)
--- a/app/Models/ToolboxTranslate.php
+++ b/app/Models/ToolboxTranslate.php
@@ -13,4 +13,10 @@ class ToolboxTranslate extends Translate
         'singular' => 'traduction',
         'plural' => 'traductions',
         'oneinstance' => true];
+
+    public function getPaths()
+    {
+        return array_merge(parent::getPaths(), ['vendor/cubedesigners']);
+    }
+
 }

diff --git a/composer.lock b/composer.lock
index 63f180bca4113da8bd6741a55cd47a07677ef2ae..5847d007c310803c53c0fdd9b565c9074211a919 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -75,16 +75,16 @@
         },
         {
             "name": "backpack/crud",
-            "version": "4.1.27",
+            "version": "4.1.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Laravel-Backpack/CRUD.git",
-                "reference": "bd1bab5dde08df20eebd730ca3a2992e1bf334f7"
+                "reference": "011e818304b3ebac28b673c1c91018590bdceb12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/bd1bab5dde08df20eebd730ca3a2992e1bf334f7",
-                "reference": "bd1bab5dde08df20eebd730ca3a2992e1bf334f7",
+                "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/011e818304b3ebac28b673c1c91018590bdceb12",
+                "reference": "011e818304b3ebac28b673c1c91018590bdceb12",
                 "shasum": ""
             },
             "require": {
@@ -102,6 +102,12 @@
                 "scrutinizer/ocular": "~1.7|~1.1",
                 "spatie/laravel-translatable": "^4.0"
             },
+            "suggest": {
+                "backpack/filemanager": "Required to use the browse and browse_multiple fields.",
+                "backpack/generators": "Required on localhost to easily generate CRUDs, models, controllers etc.",
+                "backpack/revise-operation": "Optional operation to remember all entry changes, undo and redo them (aka audit trait).",
+                "digitallyhappy/toggle-field-for-backpack": "Optional field to toggle a boolean. Prettier alternative to the checkbox field."
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -157,9 +163,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Laravel-Backpack/CRUD/issues",
-                "source": "https://github.com/Laravel-Backpack/CRUD/tree/4.1.27"
+                "source": "https://github.com/Laravel-Backpack/CRUD/tree/4.1.28"
             },
-            "time": "2020-11-08T12:56:14+00:00"
+            "time": "2020-12-08T20:21:54+00:00"
         },
         {
             "name": "backpack/logmanager",
@@ -1083,13 +1089,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubedesigners_userdatabase.git",
-                "reference": "2d1141adeaa775d4295bad0f7bd5861094fd2f37"
+                "reference": "dca252aac1c06bc61a54cf3fde4a61a4034d8c8a"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-6a5af4.tar",
-                "reference": "2d1141adeaa775d4295bad0f7bd5861094fd2f37",
-                "shasum": "6d5a94612765abba2650f4ae658616bfb7f3dcd5"
+                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-a37e90.tar",
+                "reference": "dca252aac1c06bc61a54cf3fde4a61a4034d8c8a",
+                "shasum": "6235517745e6dd115dc0572171fe1f21ccb07530"
             },
             "require": {
                 "cubist/cms-back": "dev-master"
@@ -1110,7 +1116,7 @@
                 }
             ],
             "description": "Cubedesigners common users database",
-            "time": "2020-12-08T15:37:37+00:00"
+            "time": "2020-12-09T07:05:00+00:00"
         },
         {
             "name": "cubist/cms-back",
@@ -1118,13 +1124,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "cff7f61007f7062fd148fe4293c6fd73a15bdf75"
+                "reference": "9833ca5f7ecedeecdd5f8c9062a3f2690386156e"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-0c31da.tar",
-                "reference": "cff7f61007f7062fd148fe4293c6fd73a15bdf75",
-                "shasum": "3b9d442ddc57f2ed4169179661da4454d658f9c1"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-93ea0b.tar",
+                "reference": "9833ca5f7ecedeecdd5f8c9062a3f2690386156e",
+                "shasum": "0cfb6cae6a3bab6659abf087f9201e3fdb3c43b7"
             },
             "require": {
                 "backpack/backupmanager": "^2.0",
@@ -1199,7 +1205,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2020-12-08T20:28:43+00:00"
+            "time": "2020-12-09T12:11:14+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -1484,16 +1490,16 @@
         },
         {
             "name": "cviebrock/eloquent-sluggable",
-            "version": "7.0.1",
+            "version": "7.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cviebrock/eloquent-sluggable.git",
-                "reference": "4e5a961965f92ef0e3c10ec4ebc073a6ab6bc4f0"
+                "reference": "b3616ff51a80f8f408879b2f41936e8b45748e13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cviebrock/eloquent-sluggable/zipball/4e5a961965f92ef0e3c10ec4ebc073a6ab6bc4f0",
-                "reference": "4e5a961965f92ef0e3c10ec4ebc073a6ab6bc4f0",
+                "url": "https://api.github.com/repos/cviebrock/eloquent-sluggable/zipball/b3616ff51a80f8f408879b2f41936e8b45748e13",
+                "reference": "b3616ff51a80f8f408879b2f41936e8b45748e13",
                 "shasum": ""
             },
             "require": {
@@ -1501,7 +1507,7 @@
                 "illuminate/config": "^7.0",
                 "illuminate/database": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "require-dev": {
                 "limedeck/phpunit-detailed-printer": "^5.0",
@@ -1545,9 +1551,9 @@
             ],
             "support": {
                 "issues": "https://github.com/cviebrock/eloquent-sluggable/issues",
-                "source": "https://github.com/cviebrock/eloquent-sluggable/tree/master"
+                "source": "https://github.com/cviebrock/eloquent-sluggable/tree/7.0.2"
             },
-            "time": "2020-04-07T03:18:54+00:00"
+            "time": "2020-12-08T23:04:55+00:00"
         },
         {
             "name": "cviebrock/laravel-elasticsearch",
@@ -8838,21 +8844,21 @@
     "packages-dev": [
         {
             "name": "barryvdh/laravel-ide-helper",
-            "version": "v2.8.1",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "affa55122f83575888d4ebf1728992686e8223de"
+                "reference": "5515cabea39b9cf55f98980d0f269dc9d85cfcca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/affa55122f83575888d4ebf1728992686e8223de",
-                "reference": "affa55122f83575888d4ebf1728992686e8223de",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/5515cabea39b9cf55f98980d0f269dc9d85cfcca",
+                "reference": "5515cabea39b9cf55f98980d0f269dc9d85cfcca",
                 "shasum": ""
             },
             "require": {
                 "barryvdh/reflection-docblock": "^2.0.6",
-                "composer/composer": "^1.6 || ^2.0@dev",
+                "composer/composer": "^1.6 || ^2",
                 "doctrine/dbal": "~2.3",
                 "ext-json": "*",
                 "illuminate/console": "^6 || ^7 || ^8",
@@ -8862,13 +8868,14 @@
                 "phpdocumentor/type-resolver": "^1.1.0"
             },
             "require-dev": {
+                "ext-pdo_sqlite": "*",
                 "friendsofphp/php-cs-fixer": "^2",
                 "illuminate/config": "^6 || ^7 || ^8",
                 "illuminate/view": "^6 || ^7 || ^8",
-                "mockery/mockery": "^1.3",
+                "mockery/mockery": "^1.3.3",
                 "orchestra/testbench": "^4 || ^5 || ^6",
                 "phpunit/phpunit": "^8.5 || ^9",
-                "spatie/phpunit-snapshot-assertions": "^1.4 || ^2.2 || ^3",
+                "spatie/phpunit-snapshot-assertions": "^1.4 || ^2.2 || ^3 || ^4",
                 "vimeo/psalm": "^3.12"
             },
             "type": "library",
@@ -8911,7 +8918,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-ide-helper/issues",
-                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/master"
+                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v2.8.2"
             },
             "funding": [
                 {
@@ -8919,7 +8926,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-07T07:36:37+00:00"
+            "time": "2020-12-06T08:55:05+00:00"
         },
         {
             "name": "barryvdh/reflection-docblock",