wait #5127 @1.5

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2c4242eeb16d39f9a7cb2d2bcf31e80fcd7059ad..157e204f428d67a62bd9acbb6eb8ffec7268510c 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -24,8 +24,9 @@
   <component name="ChangeListManager">
     <list default="true" id="5d2ecd5e-a05a-4f96-a195-fa6372618165" name="Default Changelist" comment="wip #5127">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Fields/FluidbookID.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Fields/FluidbookID.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Models/ELearningPackage.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ELearningPackage.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Providers/AuthServiceProvider.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Providers/AuthServiceProvider.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/assign.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/assign.blade.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -688,14 +689,7 @@
       <workItem from="1645197416166" duration="5769000" />
       <workItem from="1645785620458" duration="1425000" />
       <workItem from="1645813363450" duration="1335000" />
-      <workItem from="1646037639313" duration="3681000" />
-    </task>
-    <task id="LOCAL-00205" summary="wait #4879 @0.25">
-      <created>1637339144119</created>
-      <option name="number" value="00205" />
-      <option name="presentableId" value="LOCAL-00205" />
-      <option name="project" value="LOCAL" />
-      <updated>1637339144119</updated>
+      <workItem from="1646037639313" duration="10493000" />
     </task>
     <task id="LOCAL-00206" summary="wip #4895 @1">
       <created>1637575906035</created>
@@ -1033,7 +1027,14 @@
       <option name="project" value="LOCAL" />
       <updated>1645815072242</updated>
     </task>
-    <option name="localTasksCounter" value="254" />
+    <task id="LOCAL-00254" summary="wip #5127">
+      <created>1646052965428</created>
+      <option name="number" value="00254" />
+      <option name="presentableId" value="LOCAL-00254" />
+      <option name="project" value="LOCAL" />
+      <updated>1646052965428</updated>
+    </task>
+    <option name="localTasksCounter" value="255" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/app/Models/ELearningPackage.php b/app/Models/ELearningPackage.php
index 50693faec4ff21ad54cfebe0da3d33286a3df319..87bc84eed28c0afdb73f83df07eca2307bf3719d 100644 (file)
--- a/app/Models/ELearningPackage.php
+++ b/app/Models/ELearningPackage.php
@@ -26,7 +26,6 @@ class ELearningPackage extends ToolboxModel
 
     protected static $_permissionBase = 'elearning-package';
 
-
     protected $_operations = [ImportOperation::class, PreviewOperation::class, DownloadOperation::class];
 
     public function setFields()

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index e9a8548545c82edc36b309b05a2aa2beb4027847..1dbdb32d62b0e81d7bfd9129f4d04ba9ee76b7d4 100644 (file)
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -28,9 +28,5 @@ class AuthServiceProvider extends ServiceProvider
             return $user->hasRole('superadmin') ? true : null;
         });
 
-//        Gate::before(function ($user, $ability) {
-//            //debug($user);
-//            return $user->hasPermissionTo($ability) ? true : null;
-//        });
     }
 }

diff --git a/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/assign.blade.php b/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/assign.blade.php
index 8c3d9df59c3e0605f590c6a794fe8c9cffe9388d..95bfce8aaf48eccb7d4e1bf844d9a5d87d7ee4b3 100644 (file)
--- a/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/assign.blade.php
+++ b/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/assign.blade.php
@@ -75,7 +75,7 @@
         <select class="assign" data-id="{{$entry->getKey()}}">
             <option value="null">-</option>
             <option value="{{backpack_user()->id}}">{{__('Je vais traiter la demander')}}</option>
-            <option value="5256">{{__('Confier à :reseller',['reseller'=>'Mallaury'])}}</option>
+{{--            <option value="5256">{{__('Confier à :reseller',['reseller'=>'Mallaury'])}}</option>--}}
             <option value="94">{{__('Confier à :reseller',['reseller'=>'Kadreo'])}}</option>
         </select>
     </a>