wait #7698 @1

diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml
index f66b5e114d794de0d1301e78e739ca006c50fad2..cb7cbe02597e967da5b837ddcde07e77092ccad8 100644 (file)
--- a/.docker/production/docker-compose.yml
+++ b/.docker/production/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - nginxproxy
       - fluidbook-v3
 
-  fluidbook-v3:
+  php-fpm:
     container_name: fluidbook-v3
     hostname: fluidbook-v3
     build: './images/php-fpm'

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 1343a3ce3633f18372af28d8f4eeba1abd38a3d0..71105b78ca3cc750a83a246261cc47692d9a6967 100644 (file)
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-251.25410.129">
+  <component name="dataSourceStorageLocal" created-in="IU-252.23892.409">
     <data-source name="MySQL - dev.fluidbook.com" uuid="9a7a0ad9-c6dc-4e29-b76d-f95d9cb2182a">
       <database-info product="MySQL" version="5.6.27-0ubuntu0.15.04.1-log" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.35 ( Revision: 5fb9c5849535c13917c2cf9baaece6ef9693ef27 )" dbms="MYSQL" exact-version="5.6.27">
         <extra-name-characters>#@</extra-name-characters>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 56fddfc9cbabbae460cb3ffa6a3273a2d0ffd507..ad5eeef1c3c4bc0fd8fa5d45f71bb211bd8fe401 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,12 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wait #7482 @0.5">
+    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wait #7140 @1">
+      <change beforePath="$PROJECT_DIR$/.docker/production/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/production/docker-compose.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/application/configs/application.ini" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/configs/application.ini" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/application/forms/RequestQuote.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/forms/RequestQuote.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/languages/en.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/languages/en.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/application/views/helpers/ExemplePublication.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/views/helpers/ExemplePublication.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -268,6 +267,7 @@
     &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;SHELLCHECK.PATH&quot;: &quot;C:\\Users\\vince\\AppData\\Roaming\\JetBrains\\IntelliJIdea2025.2\\plugins\\Shell Script\\shellcheck.exe&quot;,
     &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
     &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
     &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
@@ -537,8 +537,40 @@
       <option name="USE_PATTERN" value="false" />
       <method />
     </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <option name="TEST_OBJECT" value="class" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="TestNG">
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <properties />
+      <listeners />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="js.build_tools.gulp">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <gulpfile />
+      <tasks />
+      <arguments />
+      <pass-parent-envs>true</pass-parent-envs>
+      <method v="2" />
+    </configuration>
     <configuration default="true" type="tests" factoryName="Nosetests">
       <module name="FluidbookWebV3" />
+      <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <option name="SDK_HOME" value="" />
@@ -554,6 +586,7 @@
       <method v="2" />
     </configuration>
     <configuration default="true" type="tests" factoryName="Twisted Trial">
+      <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <option name="SDK_HOME" value="" />
@@ -570,6 +603,7 @@
     </configuration>
     <configuration default="true" type="tests" factoryName="Unittests">
       <module name="FluidbookWebV3" />
+      <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <option name="SDK_HOME" value="" />
@@ -585,6 +619,7 @@
     </configuration>
     <configuration default="true" type="tests" factoryName="py.test">
       <module name="FluidbookWebV3" />
+      <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <option name="SDK_HOME" value="" />
@@ -600,43 +635,12 @@
       <option name="_new_targetType" value="&quot;PATH&quot;" />
       <method v="2" />
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <option name="TEST_OBJECT" value="class" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="TestNG">
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <properties />
-      <listeners />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <pass-parent-envs>true</pass-parent-envs>
-      <method v="2" />
-    </configuration>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9823dce3aa75-fbdcb00ec9e3-intellij.indexing.shared.core-IU-251.25410.129" />
-        <option value="bundled-js-predefined-d6986cc7102b-6a121458b545-JavaScript-IU-251.25410.129" />
+        <option value="bundled-jdk-9823dce3aa75-bf35d07a577b-intellij.indexing.shared.core-IU-252.23892.409" />
+        <option value="bundled-js-predefined-d6986cc7102b-e03c56caf84a-JavaScript-IU-252.23892.409" />
       </set>
     </attachedChunks>
   </component>
@@ -853,7 +857,10 @@
       <workItem from="1744294067933" duration="116000" />
       <workItem from="1744297988591" duration="226000" />
       <workItem from="1744391230839" duration="6198000" />
-      <workItem from="1747127803785" duration="1921000" />
+      <workItem from="1747127803785" duration="2920000" />
+      <workItem from="1747400653125" duration="1460000" />
+      <workItem from="1753189368962" duration="835000" />
+      <workItem from="1755779481986" duration="152000" />
     </task>
     <task id="LOCAL-00117" summary="fix #1407 @1">
       <created>1494411210038</created>
@@ -1198,7 +1205,7 @@
       <option name="project" value="LOCAL" />
       <updated>1682409989659</updated>
     </task>
-    <option name="localTasksCounter" value="184" />
+    <option name="localTasksCounter" value="185" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">
         <option name="APIKey" value="ee454486fcd47aa38e5c99d5a7dc44cff1f65597" />
@@ -1241,7 +1248,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="fix #3915 @0.25" />
     <MESSAGE value="wait #4191 @0.75" />
     <MESSAGE value="wip #4191 @0.5" />
     <MESSAGE value="wip #3753" />
@@ -1266,7 +1272,8 @@
     <MESSAGE value="wip #7474" />
     <MESSAGE value="wait #7480 @1" />
     <MESSAGE value="wait #7482 @0.5" />
-    <option name="LAST_COMMIT_MESSAGE" value="wait #7482 @0.5" />
+    <MESSAGE value="wait #7140 @1" />
+    <option name="LAST_COMMIT_MESSAGE" value="wait #7140 @1" />
     <option name="NON_MODAL_COMMIT_POSTPONE_SLOW_CHECKS" value="false" />
   </component>
   <component name="XDebuggerManager">

diff --git a/framework/application/views/helpers/ExemplePublication.php b/framework/application/views/helpers/ExemplePublication.php
index dba8a9a77f2bc73072c85bbf2118be928087c778..a42e4b1dc8838e9a12af8d2079485d8ec209ee67 100644 (file)
--- a/framework/application/views/helpers/ExemplePublication.php
+++ b/framework/application/views/helpers/ExemplePublication.php
@@ -15,6 +15,10 @@ class Fluidbook_View_Helper_ExemplePublication extends CubeIT_View_Helper_Abstra
             $page--;\r
         }\r
 \r
+        if(is_object($fluidbook_id)){\r
+            return;\r
+        }\r
+\r
         $cssid = 'exemple-publication-' . $fluidbook_id . '-' . $page;\r
 \r
         $cssprops = array('image' => array('prop' => 'background-image', 'format' => 'url("%s")'),\r