wip #5127

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 13153bec689234fcb80208b3c62c1203f9d3df15..2c4242eeb16d39f9a7cb2d2bcf31e80fcd7059ad 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,8 +22,10 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="5d2ecd5e-a05a-4f96-a195-fa6372618165" name="Default Changelist" comment="wip #5127 @1">
+    <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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -685,14 +687,8 @@
       <workItem from="1645090369550" duration="6000" />
       <workItem from="1645197416166" duration="5769000" />
       <workItem from="1645785620458" duration="1425000" />
-      <workItem from="1645813363450" duration="1137000" />
-    </task>
-    <task id="LOCAL-00204" summary="wait #4895 @1.5">
-      <created>1637325134534</created>
-      <option name="number" value="00204" />
-      <option name="presentableId" value="LOCAL-00204" />
-      <option name="project" value="LOCAL" />
-      <updated>1637325134534</updated>
+      <workItem from="1645813363450" duration="1335000" />
+      <workItem from="1646037639313" duration="3681000" />
     </task>
     <task id="LOCAL-00205" summary="wait #4879 @0.25">
       <created>1637339144119</created>
@@ -1030,7 +1026,14 @@
       <option name="project" value="LOCAL" />
       <updated>1645813384000</updated>
     </task>
-    <option name="localTasksCounter" value="253" />
+    <task id="LOCAL-00253" summary="wip #5127">
+      <created>1645815072242</created>
+      <option name="number" value="00253" />
+      <option name="presentableId" value="LOCAL-00253" />
+      <option name="project" value="LOCAL" />
+      <updated>1645815072242</updated>
+    </task>
+    <option name="localTasksCounter" value="254" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1062,7 +1065,6 @@
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="wip #4962 @0.5" />
     <MESSAGE value="wait #4962 @0.25" />
     <MESSAGE value="wait #4977 @0.25" />
     <MESSAGE value="wip #5041 @0.75" />
@@ -1087,7 +1089,8 @@
     <MESSAGE value="wip #5041 @0.25" />
     <MESSAGE value="wait #5109 @2.5" />
     <MESSAGE value="wip #5127 @1" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #5127 @1" />
+    <MESSAGE value="wip #5127" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #5127" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

diff --git a/app/Fields/FluidbookID.php b/app/Fields/FluidbookID.php
index 1e6131a35f61f4ce29a1d1ca45aa0a6ded9a5105..7f3312a35414eb03a83112d13f790e9e39208d2c 100644 (file)
--- a/app/Fields/FluidbookID.php
+++ b/app/Fields/FluidbookID.php
@@ -16,7 +16,11 @@ class FluidbookID extends SelectFromArray
         if (backpack_user()) {
             return Cache::remember('fluidbok_id_' . backpack_user()->id, 360, function () {
                 $res = [];
-                foreach (DB::table('extranet_clean.books')->whereIn('proprietaire', explode(',', backpack_user()->e1_ws_rights))->orderByDesc('book_id')->get() as $book) {
+                $q = DB::table('extranet_clean.books');
+                if (!backpack_user()->hasPermissionTo('fluidbook-publication:admin')) {
+                    $q->whereIn('proprietaire', explode(',', backpack_user()->e1_ws_rights));
+                }
+                foreach ($q->orderByDesc('book_id')->get() as $book) {
                     $res[$book->book_id] = $book->book_id . ' - ' . $book->nom;
                 }
                 return $res;

diff --git a/composer.json b/composer.json
index 9e1cdfabc951d03783312b2b65a9791ea50e8b1e..7007a0a379938e3efb3f09428717c9c71e207f68 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,6 @@
         "mxl/laravel-job": "^1.2",
         "php-ffmpeg/php-ffmpeg": "^0.18.0",
         "phpoffice/phpspreadsheet": "^1.18",
-        "predis/predis": "^1.1",
         "rustici-software/scormcloud-api-v2-client-php": "^2.0"
     },
     "require-dev": {