Merge pull request #27 from tomolimo/RE-2.3

Added try catch to prevent error
tomolimo · Nov 24, 2023 · 369b9f6 · 369b9f6
2 parents 3157cb8 + 503fa76
commit 369b9f6
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 27 deletions.
diff --git a/workflow/engine/methods/login/version-pmos.php b/workflow/engine/methods/login/version-pmos.php
@@ -1,5 +1,5 @@
 <?php
 if (!defined('PM_VERSION')) {
-   define("PM_VERSION", "3.3.0-community-RE-2.2");
-   define("PM_BUILD_VERSION", "3.3.0-community-RE-2.2");
+   define("PM_VERSION", "3.3.0-community-RE-2.3");
+   define("PM_BUILD_VERSION", "3.3.0-community-RE-2.3");
 }
diff --git a/workflow/engine/templates/cases/caseHistoryDynaformPage.js b/workflow/engine/templates/cases/caseHistoryDynaformPage.js
@@ -236,18 +236,20 @@
 
   function historyDynaformGridPreview(){
     //historyDynaformGridPreviewGlobalSystem
-    var DYN_UID = historyDynaformGridPreviewGlobal.DYN_UID;
-    var DYN_TITLE = historyDynaformGridPreviewGlobal.DYN_TITLE;
+    try {
+       var DYN_UID = historyDynaformGridPreviewGlobal.DYN_UID;
+       var DYN_TITLE = historyDynaformGridPreviewGlobal.DYN_TITLE;
 
-    var tabData = Ext.util.JSON.encode(historyDynaformGridPreviewGlobal);
-    var tabName = 'historyDynaformGridPreview_'+DYN_UID;
-    var tabTitle = 'Preview('+DYN_TITLE+')';
+       var tabData = Ext.util.JSON.encode(historyDynaformGridPreviewGlobal);
+       var tabName = 'historyDynaformGridPreview_' + DYN_UID;
+       var tabTitle = 'Preview(' + DYN_TITLE + ')';
 
-    window.parent.ActionTabFrameGlobal.tabData = tabData;
-    window.parent.ActionTabFrameGlobal.tabName = tabName;
-    window.parent.ActionTabFrameGlobal.tabTitle = tabTitle;
+       window.parent.ActionTabFrameGlobal.tabData = tabData;
+       window.parent.ActionTabFrameGlobal.tabName = tabName;
+       window.parent.ActionTabFrameGlobal.tabTitle = tabTitle;
 
-    window.parent.Actions.tabFrame(tabName);
+       window.parent.Actions.tabFrame(tabName);
+    } catch (e) { };
   }
   var historyDynaformGridHistoryGlobal = {};
       historyDynaformGridHistoryGlobal.PRO_UID = '';

diff --git a/workflow/public_html/glpi/glpi.js b/workflow/public_html/glpi/glpi.js
@@ -145,22 +145,24 @@ pm_glpi = {
                e.stopPropagation();
             });
             locElt.addEventListener('click', (e) => {
-               e.stopPropagation();
-               let PRO_UID = document.querySelector('div.x-grid3-row.x-grid3-row-selected div.x-grid3-cell-inner.x-grid3-col-PRO_UID').textContent;
-               let APP_UID = document.querySelector('div.x-grid3-row.x-grid3-row-selected div.x-grid3-cell-inner.x-grid3-col-APP_UID').textContent;
-               let TAS_UID = document.querySelector('div.x-grid3-row.x-grid3-row-selected div.x-grid3-cell-inner.x-grid3-col-TAS_UID').textContent;
-               let DYN_UID = document.querySelector('div.x-grid3-row.x-grid3-row-selected div.x-grid3-cell-inner.x-grid3-col-DYN_UID').textContent;
-               let DYN_TITLE = document.querySelector('div.x-grid3-row.x-grid3-row-selected div.x-grid3-cell-inner.x-grid3-col-4').textContent;
-               // here we postMessage of this dynaform view request
-               window.parent.postMessage({
-                  message: 'historydynaformgridpreview',
-                  PRO_UID: PRO_UID,
-                  APP_UID: APP_UID,
-                  TAS_UID: TAS_UID,
-                  DYN_UID: DYN_UID,
-                  DYN_TITLE: DYN_TITLE,
-                  glpi_data: GLPI_DATA
-               }, GLPI_DATA.glpi_url);
+               try {
+                  e.stopPropagation();
+                  let PRO_UID   = document.querySelector('div.x-grid3-row.x-grid3-row-selected div.x-grid3-cell-inner.x-grid3-col-PRO_UID').textContent;
+                  let APP_UID   = document.querySelector('div.x-grid3-row.x-grid3-row-selected div.x-grid3-cell-inner.x-grid3-col-APP_UID').textContent;
+                  let TAS_UID   = document.querySelector('div.x-grid3-row.x-grid3-row-selected div.x-grid3-cell-inner.x-grid3-col-TAS_UID').textContent;
+                  let DYN_UID   = document.querySelector('div.x-grid3-row.x-grid3-row-selected div.x-grid3-cell-inner.x-grid3-col-DYN_UID').textContent;
+                  let DYN_TITLE = document.querySelector('div.x-grid3-row.x-grid3-row-selected div.x-grid3-cell-inner.x-grid3-col-4').textContent;
+                  // here we postMessage of this dynaform view request
+                  window.parent.postMessage({
+                     message: 'historydynaformgridpreview',
+                     PRO_UID: PRO_UID,
+                     APP_UID: APP_UID,
+                     TAS_UID: TAS_UID,
+                     DYN_UID: DYN_UID,
+                     DYN_TITLE: DYN_TITLE,
+                     glpi_data: GLPI_DATA
+                  }, GLPI_DATA.glpi_url);
+               } catch (e) { }
             });
          }
       }