wip #5041

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 9040504e8f5cdf41bf0654c69828146657376a98..ade4eccbe72d31d73e607b54a076396b0a8aad9f 100644 (file)
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -2,7 +2,14 @@
 <project version="4">
   <component name="PublishConfigData" autoUpload="Always" serverName="toolbox.fluidbook.com" autoUploadExternalChanges="true">
     <serverData>
-      <paths name="apps.fluidbook.com">
+      <paths name="batman.cubedesigners.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="ccv-montpellier.fr">
         <serverdata>
           <mappings>
             <mapping local="$PROJECT_DIR$" web="/" />
@@ -44,6 +51,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="dev.extranet.cubedesigners.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="dev.fluidbook.com">
         <serverdata>
           <mappings>
@@ -51,6 +65,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="dev.pm-instrumentation.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="dev.rbcmobilier.com">
         <serverdata>
           <mappings>
@@ -114,6 +135,20 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="odl.cube">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="odl.paris.cubedesigners.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="parrotmail.dev.cubedesigners.com">
         <serverdata>
           <mappings>
@@ -121,6 +156,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="preview.cubedesigners.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="pro.cubjeans.com">
         <serverdata>
           <mappings>
@@ -135,24 +177,24 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="toolbox.fluidbook.com">
+      <paths name="stats3.fluidbook.com">
         <serverdata>
           <mappings>
-            <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
+            <mapping local="$PROJECT_DIR$" web="/" />
           </mappings>
-          <excludedPaths>
-            <excludedPath local="true" path="$PROJECT_DIR$/vendor" />
-          </excludedPaths>
         </serverdata>
       </paths>
-      <paths name="vm.hf-customercare.com">
+      <paths name="toolbox.fluidbook.com">
         <serverdata>
           <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
+            <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
           </mappings>
+          <excludedPaths>
+            <excludedPath local="true" path="$PROJECT_DIR$/.env" />
+          </excludedPaths>
         </serverdata>
       </paths>
-      <paths name="wheel02.hf-customercare.com">
+      <paths name="toolbox.fluidbook.com (project level)">
         <serverdata>
           <mappings>
             <mapping local="$PROJECT_DIR$" web="/" />
@@ -236,6 +278,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="www.hf-customercare.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="www.kadreo.com">
         <serverdata>
           <mappings>
@@ -285,6 +334,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="www.pm-instrumentation.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="www.preventicom.com">
         <serverdata>
           <mappings>

diff --git a/app/Models/Base/ToolboxModel.php b/app/Models/Base/ToolboxModel.php
index 9076a1e3fa912a6fa4aa84a391047da7c6f3c8e4..e4d54c93fe7d68b3be58625bfb35a1eb858cd3c7 100644 (file)
--- a/app/Models/Base/ToolboxModel.php
+++ b/app/Models/Base/ToolboxModel.php
@@ -26,9 +26,6 @@ class ToolboxModel extends CubistMagicAbstractModel
             return;
         }
         $builder->whereIn(static::$_ownerAttribute, backpack_user()->getManagedUsers());
-        if (Auth::user()->hasPermissionTo(static::$_permissionBase . ':write')) {
-            $builder->orWhere('created_ok', 0);
-        }
     }
 
     public function addOwnerField($tab = null)

diff --git a/app/Models/ELearningMedia.php b/app/Models/ELearningMedia.php
index 22a5cafc1e04cdc7762cc259899a2e3a1ed2767a..a1971ac561588b6e3dc6e115e4bf50c9827bff76 100644 (file)
--- a/app/Models/ELearningMedia.php
+++ b/app/Models/ELearningMedia.php
@@ -27,6 +27,6 @@ class ELearningMedia extends ToolboxModel
         $this->addColumnDateFields();
 
         $this->addField('complete_pct', Percent::class, __('Marquer terminé quand ce pourcentage est lu'), ['default' => 75]);
-        $this->addField('media', Files::class, __('Media'));
+        $this->addField('file', Files::class, __('Media'));
     }
 }

diff --git a/composer.lock b/composer.lock
index abd3da3032df8f17e50a44b0231120459cb0dc0f..536ad875c94ea4c17b7af6c05ff1b245e2c2dbd9 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1482,13 +1482,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "ed7eeb5a174ce897fa19234651297b375f1c209f"
+                "reference": "28d4e0e991dca01af6cd3095d85ec67b60448373"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-8b79c7.tar",
-                "reference": "ed7eeb5a174ce897fa19234651297b375f1c209f",
-                "shasum": "aa7fb4ba302229a38440c377fdf254be5fb05266"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-03ce41.tar",
+                "reference": "28d4e0e991dca01af6cd3095d85ec67b60448373",
+                "shasum": "e768e8c863cb325bb1699ccdda2eb9ab24ec3b2a"
             },
             "require": {
                 "backpack/backupmanager": "^3.0",
@@ -1568,7 +1568,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2022-01-20T13:43:16+00:00"
+            "time": "2022-01-20T15:33:21+00:00"
         },
         {
             "name": "cubist/cms-front",