Merged in release/3.7.3 (pull request #8340)

release/3.7.3 Approved-by: Julio Cesar Laura Avendaño
2022-01-10 16:08:48 +00:00
parent 51fd61657e 4da642adb2
commit 0c36bf903f
11 changed files with 193 additions and 19 deletions
--- a/workflow/engine/content/translations/english/processmaker.en.po
+++ b/workflow/engine/content/translations/english/processmaker.en.po
@@ -7019,6 +7019,18 @@ msgstr "Down"
 msgid "Download"
 msgstr "Download"

+# TRANSLATION
+# LABEL/ID_DOWNLOAD_SVG
+#: LABEL/ID_DOWNLOAD_SVG
+msgid "Download SVG"
+msgstr "Download SVG"
+
+# TRANSLATION
+# LABEL/ID_DOWNLOAD_PNG
+#: LABEL/ID_DOWNLOAD_PNG
+msgid "Download PNG"
+msgstr "Download PNG"
+
 # TRANSLATION
 # LABEL/ID_DOWNLOADING_FILE
 #: LABEL/ID_DOWNLOADING_FILE
@@ -19211,6 +19223,12 @@ msgstr "Memory Limit (MB)"
 msgid "Memory Limit value has to be either a positive integer or -1"
 msgstr "Memory Limit value has to be either a positive integer or -1"

+# TRANSLATION
+# LABEL/ID_MENU
+#: LABEL/ID_MENU
+msgid "Menu"
+msgstr "Menu"
+
 # TRANSLATION
 # LABEL/ID_MENU_COLOR
 #: LABEL/ID_MENU_COLOR
@@ -21299,6 +21317,12 @@ msgstr "Page"
 msgid "Page Size"
 msgstr "Page Size"

+# TRANSLATION
+# LABEL/ID_PANNING
+#: LABEL/ID_PANNING
+msgid "Panning"
+msgstr "Panning"
+
 # TRANSLATION
 # LABEL/ID_PARALLEL_TASK
 #: LABEL/ID_PARALLEL_TASK
@@ -24587,6 +24611,12 @@ msgstr "See complete list"
 msgid "Select"
 msgstr "Select"

+# TRANSLATION
+# LABEL/ID_SELECTION_ZOOM
+#: LABEL/ID_SELECTION_ZOOM
+msgid "Selection zoom"
+msgstr "Selection zoom"
+
 # TRANSLATION
 # LABEL/ID_SELECTED
 #: LABEL/ID_SELECTED
@@ -26237,6 +26267,30 @@ msgstr "The task doesn't have any steps"
 msgid "Overdue"
 msgstr "Overdue"

+# TRANSLATION
+# LABEL/ID_TASK_OVERDUE_DAYS
+#: LABEL/ID_TASK_OVERDUE_DAYS
+msgid "Overdue days"
+msgstr "Overdue days"
+
+# TRANSLATION
+# LABEL/ID_TASK_DAYS_BEFORE_AT_RISK
+#: LABEL/ID_TASK_DAYS_BEFORE_AT_RISK
+msgid "Days before being At-Risk"
+msgstr "Days before being At-Risk"
+
+# TRANSLATION
+# LABEL/ID_TASK_DAYS_BEFORE_OVERDUE
+#: LABEL/ID_TASK_DAYS_BEFORE_OVERDUE
+msgid "Days before being Overdue"
+msgstr "Days before being Overdue"
+
+# TRANSLATION
+# LABEL/ID_TASK_ON_TIME
+#: LABEL/ID_TASK_ON_TIME
+msgid "On time"
+msgstr "On time"
+
 # TRANSLATION
 # LABEL/ID_TASK_PROPERTIES_SAVE
 #: LABEL/ID_TASK_PROPERTIES_SAVE
@@ -29057,6 +29111,18 @@ msgstr "You uploaded an unsupported file extension, please review the permitted
 msgid "Zip Code"
 msgstr "Zip Code"

+# TRANSLATION
+# LABEL/ID_ZOOM_IN
+#: LABEL/ID_ZOOM_IN
+msgid "Zoom in"
+msgstr "Zoom in"
+
+# TRANSLATION
+# LABEL/ID_ZOOM_OUT
+#: LABEL/ID_ZOOM_OUT
+msgid "Zoom out"
+msgstr "Zoom out"
+
 # TRANSLATION
 # LABEL/IMAGE_DETAIL
 #: LABEL/IMAGE_DETAIL
@@ -53341,4 +53407,10 @@ msgstr "Sorry, No Solid icons found!"
 # LABEL/ID_SELECT_PROCESS_DRILL
 #: LABEL/ID_SELECT_PROCESS_DRILL
 msgid "Select a process to have the Drilling Down Options"
-msgstr "Select a process to have the Drilling Down Options"
+msgstr "Select a process to have the Drilling Down Options"
+
+# TRANSLATION
+# LABEL/ID_TASK_METRICS
+#: LABEL/ID_TASK_METRICS
+msgid "Task metrics"
+msgstr "Task metrics"
--- a/workflow/engine/data/mysql/insert.sql
+++ b/workflow/engine/data/mysql/insert.sql
@@ -58001,6 +58001,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_DONT_MODIFY_PK_VALUE','en','You can not modify the primary key value for "{0}" field.','2014-01-15') ,
 ( 'LABEL','ID_DOWN','en','Down','2014-01-15') ,
 ( 'LABEL','ID_DOWNLOAD','en','Download','2014-01-15') ,
+( 'LABEL','ID_DOWNLOAD_SVG','en','Download SVG','2022-01-07') ,
+( 'LABEL','ID_DOWNLOAD_PNG','en','Download PNG','2022-01-07') ,
 ( 'LABEL','ID_DOWNLOADING_FILE','en','Downloading file','2014-01-15') ,
 ( 'LABEL','ID_DOWNLOADING_UPGRADE','en','Downloading upgrade:','2014-09-18') ,
 ( 'LABEL','ID_DOWNLOAD_MANUALLY','en','You can download it manually here','2014-09-18') ,
@@ -60097,6 +60099,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_MEMBER_OF','en','MEMBER OF','2014-01-15') ,
 ( 'LABEL','ID_MEMORY_LIMIT','en','Memory Limit (MB)','2014-01-15') ,
 ( 'LABEL','ID_MEMORY_LIMIT_VALIDATE','en','Memory Limit value has to be either a positive integer or -1','2017-04-05') ,
+( 'LABEL','ID_MENU','en','Menu','2022-01-07') ,
 ( 'LABEL','ID_MENU_COLOR','en','Menu Color','2021-08-10') ,
 ( 'LABEL','ID_MENU_NAME','en','Enterprise Manager','2014-10-17') ,
 ( 'LABEL','ID_MESSAGE','en','Message','2014-01-15') ,
@@ -60457,6 +60460,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_OWNER_TYPE','en','Owner type','2015-05-08') ,
 ( 'LABEL','ID_PAGE','en','Page','2014-01-15') ,
 ( 'LABEL','ID_PAGE_SIZE','en','Page Size','2014-01-15') ,
+( 'LABEL','ID_PANNING','en','Panning','2022-01-07') ,
 ( 'LABEL','ID_PARALLEL_TASK','en','Parallel Task','2014-01-15') ,
 ( 'LABEL','ID_PARAMETERS','en','Parameters','2014-01-15') ,
 ( 'LABEL','ID_PARENT_DEPARTMENT_NOT_EXIST','en','Parent department doesn''t exist','2014-01-15') ,
@@ -61023,6 +61027,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_SEE','en','See','2014-01-15') ,
 ( 'LABEL','ID_SEE_FULL_LIST','en','See complete list','2016-02-29') ,
 ( 'LABEL','ID_SELECT','en','Select','2014-01-15') ,
+( 'LABEL','ID_SELECTION_ZOOM','en','Selection zoom','2022-01-07') ,
 ( 'LABEL','ID_SELECTED','en','selected','2014-01-15') ,
 ( 'LABEL','ID_SELECTED_FIELD','en','selected field','2014-01-15') ,
 ( 'LABEL','ID_SELECTED_IMAGE_DELETED','en','The selected image has been deleted.','2014-01-15') ,
@@ -61312,6 +61317,10 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_TASK_NOT_RELATED','en','[Not related to a task]','2014-01-15') ,
 ( 'LABEL','ID_TASK_NO_STEPS','en','The task doesn''t have any steps','2014-01-15') ,
 ( 'LABEL','ID_TASK_OVERDUE','en','Overdue','2015-06-09') ,
+( 'LABEL','ID_TASK_OVERDUE_DAYS','en','Overdue days','2022-01-07') ,
+( 'LABEL','ID_TASK_DAYS_BEFORE_AT_RISK','en','Days before being At-Risk','2022-01-07') ,
+( 'LABEL','ID_TASK_DAYS_BEFORE_OVERDUE','en','Days before being Overdue','2022-01-07') ,
+( 'LABEL','ID_TASK_ON_TIME','en','On time','2022-01-07') ,
 ( 'LABEL','ID_TASK_PROPERTIES_SAVE','en','Task properties has been saved successfully','2014-01-15') ,
 ( 'LABEL','ID_TASK_REASSIGNMENTS','en','Task Reassignments','2020-12-07') ,
 ( 'LABEL','ID_TASK_TITLE','en','Task Title','2020-12-17') ,
@@ -61835,6 +61844,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_YOU_HAVE_ERROR','en','you have an error','2014-01-15') ,
 ( 'LABEL','ID_YOU_UPLOADED_AN_UNSUPPORTED_FILE_EXTENSION','en','You uploaded an unsupported file extension, please review the permitted files uploaded in the wiki of ProcessMaker for the cases notes.','2020-06-12') ,
 ( 'LABEL','ID_ZIP_CODE','en','Zip Code','2014-01-15') ,
+( 'LABEL','ID_ZOOM_IN','en','Zoom in','2022-01-07') ,
+( 'LABEL','ID_ZOOM_OUT','en','Zoom out','2022-01-07') ,
 ( 'LABEL','IMAGE_DETAIL','en','Image detail','2014-01-15') ,
 ( 'LABEL','IMPORT_LANGUAGE_ERR_NO_WRITABLE','en','The XML forms directory is not writable','2014-01-15') ,
 ( 'LABEL','IMPORT_LANGUAGE_ERR_NO_WRITABLE2','en','Some files within XMLFORM directory are not writable, to install or update the translations the system requires that all files are writable. Contact your system administrator please.','2014-01-15') ,
--- a/workflow/engine/methods/cases/casesListSetup.php
+++ b/workflow/engine/methods/cases/casesListSetup.php
@@ -26,7 +26,7 @@ $oHeadPublisher->assignNumber("availableFields", G::json_encode($availableFields
 $userCanAccess = 1;

 $pmDynaform = new PmDynaform();
-ScriptVariables::add('SYS_CREDENTIALS', $pmDynaform->getCredentials());
+ScriptVariables::add('SYS_CREDENTIALS', base64_encode(G::json_encode($pmDynaform->getCredentials())));
 ScriptVariables::add('SYS_SERVER_API', System::getHttpServerHostnameRequestsFrontEnd());
 ScriptVariables::add('SYS_SERVER_AJAX', System::getServerProtocolHost());
 ScriptVariables::add('SYS_WORKSPACE', config("system.workspace"));
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php
@@ -87,9 +87,15 @@ class WorkflowBpmn extends Project\Workflow
        return parent::getList($start, $limit, $filter, $changeCaseTo);
    }

-    public function remove($flagRemoveCases = true, $onlyDiagram = false)
+    /**
+     * Remove project bpmn.
+     * @param bool $flagRemoveCases
+     * @param bool $onlyDiagram
+     * @param array $objectsToImport
+     */
+    public function remove($flagRemoveCases = true, $onlyDiagram = false, $objectsToImport = [])
    {
-        parent::remove($flagRemoveCases, $onlyDiagram);
+        parent::remove($flagRemoveCases, $onlyDiagram, $objectsToImport);
        $this->bp->remove();
    }