]> _ Git - fluidbook-v3.git/commitdiff
wait #7482 @0.5
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 14 Apr 2025 13:26:02 +0000 (15:26 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 14 Apr 2025 13:26:02 +0000 (15:26 +0200)
.idea/workspace.xml
framework/application/controllers/AjaxController.php

index 7e59b8dd69eed9555c3c0b6ecfee69c1e8d2f774..3ac1527f7cb14af2c461ef80a708e33d9f9cf2e2 100644 (file)
@@ -4,15 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wip #7474">
-      <change beforePath="$PROJECT_DIR$/.docker/dev/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/dev/docker-compose.yml" afterDir="false" />
+    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wait #7480 @1">
       <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/views/scripts/common/footer.phtml" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/views/scripts/common/footer.phtml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Locale.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Locale.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Navigation.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Navigation.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Controller/SeoController.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Controller/SeoController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Util/Locale.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Util/Locale.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/application/controllers/AjaxController.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/controllers/AjaxController.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
       <workItem from="1744211486656" duration="5649000" />
       <workItem from="1744294067933" duration="116000" />
       <workItem from="1744297988591" duration="226000" />
-      <workItem from="1744391230839" duration="1813000" />
+      <workItem from="1744391230839" duration="4576000" />
     </task>
     <task id="LOCAL-00117" summary="fix #1407 @1">
       <created>1494411210038</created>
       <option name="project" value="LOCAL" />
       <updated>1682409989659</updated>
     </task>
-    <option name="localTasksCounter" value="182" />
+    <option name="localTasksCounter" value="183" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">
         <option name="APIKey" value="ee454486fcd47aa38e5c99d5a7dc44cff1f65597" />
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="wait #3885 @0:50" />
     <MESSAGE value="wait #3912 @0:20" />
     <MESSAGE value="fix #3915 @0.25" />
     <MESSAGE value="wait #4191 @0.75" />
     <MESSAGE value="try #7257 @2" />
     <MESSAGE value="wip #7474 @0.25" />
     <MESSAGE value="wip #7474" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #7474" />
+    <MESSAGE value="wait #7480 @1" />
+    <option name="LAST_COMMIT_MESSAGE" value="wait #7480 @1" />
     <option name="NON_MODAL_COMMIT_POSTPONE_SLOW_CHECKS" value="false" />
   </component>
   <component name="XDebuggerManager">
index c8c8bc0373781d1bdec8e9d0802d10c94e7d0afc..f7b8a257d6460514dba44665126284c7298b435b 100644 (file)
@@ -24,6 +24,7 @@ class AjaxController extends CubeIT_Controller_AjaxController
             if (isset(Bootstrap::getInstance()->getSession()->gclid)) {
                 $data['gclid'] = Bootstrap::getInstance()->getSession()->gclid;
             }
+            $data['project_type'] = stristr(APPLICATION_ENV, 'learning') ? 'elearning' : 'fluidbook';
 
             $url = 'https://toolbox.fluidbook.com/fluidbook-quote/create-from-website?data=' . base64_encode(json_encode($data));
 
@@ -52,8 +53,6 @@ class AjaxController extends CubeIT_Controller_AjaxController
         }
 
 
-
-
     }
 
 }