wip #5161 @0.25

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4fe7c895880fe5638990a4324a8e31aac36e4b1f..b913e73363652be68815926c7548b14dcc41f191 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,11 +22,13 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="5d2ecd5e-a05a-4f96-a195-fa6372618165" name="Default Changelist" comment="wip #4211 @1">
+    <list default="true" id="5d2ecd5e-a05a-4f96-a195-fa6372618165" name="Default Changelist" comment="wip #4211 @0.5">
+      <change afterPath="$PROJECT_DIR$/app/Jobs/UsersTree.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Console/Commands/Precache.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Console/Commands/Precache.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Console/Commands/WorkshopMigration.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Console/Commands/WorkshopMigration.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Models/FluidbookPublication.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/FluidbookPublication.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Models/FluidbookTranslate.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/FluidbookTranslate.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/debugbar.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/debugbar.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -698,14 +700,8 @@
       <workItem from="1646312529624" duration="5350000" />
       <workItem from="1646330633143" duration="4391000" />
       <workItem from="1646655005312" duration="12287000" />
-      <workItem from="1646731397747" duration="3638000" />
-    </task>
-    <task id="LOCAL-00215" summary="wait #4977 @0.25">
-      <created>1640247316541</created>
-      <option name="number" value="00215" />
-      <option name="presentableId" value="LOCAL-00215" />
-      <option name="project" value="LOCAL" />
-      <updated>1640247316541</updated>
+      <workItem from="1646731397747" duration="10934000" />
+      <workItem from="1647340368330" duration="4048000" />
     </task>
     <task id="LOCAL-00216" summary="wip #5041 @0.75">
       <created>1642686494944</created>
@@ -1043,7 +1039,14 @@
       <option name="project" value="LOCAL" />
       <updated>1646676664104</updated>
     </task>
-    <option name="localTasksCounter" value="264" />
+    <task id="LOCAL-00264" summary="wip #4211 @0.5">
+      <created>1646740029014</created>
+      <option name="number" value="00264" />
+      <option name="presentableId" value="LOCAL-00264" />
+      <option name="project" value="LOCAL" />
+      <updated>1646740029014</updated>
+    </task>
+    <option name="localTasksCounter" value="265" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1075,7 +1078,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 #5045 @0.5" />
     <MESSAGE value="wip #5045 @3" />
     <MESSAGE value="wait #5045" />
     <MESSAGE value="wip #5045 @0.75" />
@@ -1100,7 +1102,8 @@
     <MESSAGE value="wip #5041 @1.5" />
     <MESSAGE value="wip #5041 @2" />
     <MESSAGE value="wip #4211 @1" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #4211 @1" />
+    <MESSAGE value="wip #4211 @0.5" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #4211 @0.5" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

diff --git a/app/Models/FluidbookTranslate.php b/app/Models/FluidbookTranslate.php
index 3e68fb03d6b8371fd3a8e759b092fe06120a5ae1..e090c191f46495b0767ce628a85630cdbe553aa5 100644 (file)
--- a/app/Models/FluidbookTranslate.php
+++ b/app/Models/FluidbookTranslate.php
@@ -9,6 +9,7 @@ use App\Http\Controllers\Admin\Operations\FluidbookTranslate\ExcelExportOperatio
 use App\Http\Controllers\Admin\Operations\FluidbookTranslate\ExcelImportOperation;
 use Cubist\Backpack\Facades\App;
 use Cubist\Backpack\Magic\Models\Translate;
+use Cubist\Util\PHP;
 
 class FluidbookTranslate extends Translate
 {
@@ -28,6 +29,8 @@ class FluidbookTranslate extends Translate
 
     public function __construct(array $attributes = [])
     {
+        PHP::neverStop();
+
         $this->_availableLocales = \Cubist\Locale\Locale::getList(App::getLocale());
         $this->addEditAction('fluidbook_translate.excel_export');
         $this->addEditAction('fluidbook_translate.excel_import');
@@ -66,6 +69,7 @@ class FluidbookTranslate extends Translate
      */
     public static function getAllFluidbookTranslations()
     {
+        start_measure('Get all fluidbook translations');
         if (null === self::$_allTranslations) {
             $t = FluidbookTranslate::find(1);
             $json = json_decode($t->getRawOriginal('content_translatable'), true, 512, JSON_THROW_ON_ERROR);
@@ -84,6 +88,7 @@ class FluidbookTranslate extends Translate
                 self::$_allTranslations[$code]['nsis'] = $v;
             }
         }
+        stop_measure('Get all fluidbook translations');
         return self::$_allTranslations;
     }
 

diff --git a/config/debugbar.php b/config/debugbar.php
index d17dde2e747056d18e6b0b3f59c1bf6026bf3d9d..00cdd00ae5735ad74c05711b88f2a09c6f54dc13 100644 (file)
--- a/config/debugbar.php
+++ b/config/debugbar.php
@@ -123,7 +123,7 @@ return [
         'files'           => false, // Show the included files
         'config'          => false, // Display config settings
         'cache'           => false, // Display cache events
-        'models'          => false,  // Display models
+        'models'          => true,  // Display models
         'livewire'        => true,  // Display Livewire (when available)
     ],