diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index c6f0c90f5..92858bd7d 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -27785,6 +27785,18 @@ msgstr "View Response" msgid "Error Message" msgstr "Error Message" +# TRANSLATION +# LABEL/ID_CASE_CREATED +#: LABEL/ID_CASE_CREATED +msgid "Case created" +msgstr "Case created" + +# TRANSLATION +# LABEL/ID_CASE_ROUTED_TO +#: LABEL/ID_CASE_ROUTED_TO +msgid "Case routed to" +msgstr "Case routed to" + # additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml #: text - ADD_TAB_NAME diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 2f96e7128..f7f6545cf 100644 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -6171,7 +6171,9 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_CASE_NUMBER_CAPITALIZED','en','Case Number','2017-02-22') , ( 'LABEL','ID_ANSWERED','en','Answered','2017-02-22') , ( 'LABEL','ID_VIEW_RESPONSE','en','View Response','2017-02-22') , -( 'LABEL','ID_ERROR_MESSAGE','en','Error Message','2017-02-22') ; +( 'LABEL','ID_ERROR_MESSAGE','en','Error Message','2017-02-22') , +( 'LABEL','ID_CASE_CREATED','en','Case created','2017-06-02') , +( 'LABEL','ID_CASE_ROUTED_TO','en','Case routed to','2017-06-02'); INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php index e4c26d8ac..761160cf3 100644 --- a/workflow/engine/methods/cases/cases_Step.php +++ b/workflow/engine/methods/cases/cases_Step.php @@ -1109,11 +1109,10 @@ try { $aFields["TASK"][$sKey]["NEXT_TASK"]["TAS_TITLE"] = G::LoadTranslation("ID_ROUTE_TO_TASK_INTERMEDIATE_CATCH_MESSAGE_EVENT"); } - //SKIP ASSIGN SCRREN + //SKIP ASSIGN SCREEN if (!empty($aFields['TASK'][1])) { $currentTask = $aFields['TASK'][1]; $isWebEntry = $bmWebEntry->isTaskAWebEntry($currentTask['TAS_UID']); - $skipRoutingScreen = $isWebEntry; if ($isWebEntry) { $tplFile = 'webentry/cases_ScreenDerivation'; $caseId = $currentTask['APP_UID']; diff --git a/workflow/engine/methods/services/webentry/anonymous_login.php b/workflow/engine/methods/services/webentry/anonymousLogin.php similarity index 100% rename from workflow/engine/methods/services/webentry/anonymous_login.php rename to workflow/engine/methods/services/webentry/anonymousLogin.php diff --git a/workflow/engine/methods/services/webentry/check_case.php b/workflow/engine/methods/services/webentry/checkCase.php similarity index 100% rename from workflow/engine/methods/services/webentry/check_case.php rename to workflow/engine/methods/services/webentry/checkCase.php diff --git a/workflow/engine/methods/webentry/access.php b/workflow/engine/methods/webentry/access.php index 4631cadb3..b25770a58 100644 --- a/workflow/engine/methods/webentry/access.php +++ b/workflow/engine/methods/webentry/access.php @@ -22,7 +22,7 @@ $webEntryModel = \WebEntryPeer::retrieveByPK($weUid);
-