fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-3365 conflict resolution

Browse Source
This commit is contained in:
u1
2017-08-07 23:52:32 -04:00
parent f70b763b30
commit 2240773cba
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -15440,8 +15440,13 @@ msgid "Remove selected"
msgstr "Remove selected" msgstr "Remove selected"
# TRANSLATION # TRANSLATION
# LABEL/ENTER_VALID_URL # LABEL/ID_SELECT_DYNAFORM_USE_IN_CASE
#: LABEL/ENTER_VALID_URL #: LABEL/ID_SELECT_DYNAFORM_USE_IN_CASE
msgid "The \"dyn_uid\" parameter is required to configure a Web Entry of type \"Single Dynaform\""
msgstr "The \"dyn_uid\" parameter is required to configure a Web Entry of type \"Single Dynaform\""
# LABEL/ID_ENTER_VALID_URL
#: LABEL/ID_ENTER_VALID_URL
msgid "Enter a valid URL to redirect the browser after the web entry is completed" msgid "Enter a valid URL to redirect the browser after the web entry is completed"
msgstr "Enter a valid URL to redirect the browser after the web entry is completed" msgstr "Enter a valid URL to redirect the browser after the web entry is completed"

3
workflow/engine/data/mysql/insert.sql
View File

@@ -4068,8 +4068,9 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_SMTP_ERROR_MET_TURN_SMTP_NOT_IMPLEMENTED','en','The method TURN of the SMTP is not implemented','2014-10-21') , ( 'LABEL','ID_SMTP_ERROR_MET_TURN_SMTP_NOT_IMPLEMENTED','en','The method TURN of the SMTP is not implemented','2014-10-21') ,
( 'LABEL','ID_EVENT_ADD_CURRENT','en','Add current task user','2014-02-12') , ( 'LABEL','ID_EVENT_ADD_CURRENT','en','Add current task user','2014-02-12') ,
( 'LABEL','ID_EVENT_ADD_USERS','en','Add users','2014-02-12') , ( 'LABEL','ID_EVENT_ADD_USERS','en','Add users','2014-02-12') ,
( 'LABEL','ID_SELECT_DYNAFORM_USE_IN_CASE','en','The "dyn_uid" parameter is required to configure a Web Entry of type "Single Dynaform"','2017-07-05') ,
( 'LABEL','ID_EVENT_REMOVE_SELECTED','en','Remove selected','2014-02-12') , ( 'LABEL','ID_EVENT_REMOVE_SELECTED','en','Remove selected','2014-02-12') ,
( 'LABEL','ENTER_VALID_URL','en','Enter a valid URL to redirect the browser after the web entry is completed','2017-07-04') ; ( 'LABEL','ID_ENTER_VALID_URL','en','Enter a valid URL to redirect the browser after the web entry is completed','2017-07-04') ;
INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ) VALUES INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ) VALUES
( 'LABEL','ID_EVENT_ADD_DYNAVAR','en','Add dynavar','2014-02-12') , ( 'LABEL','ID_EVENT_ADD_DYNAVAR','en','Add dynavar','2014-02-12') ,

6
workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php
View File

@@ -351,8 +351,12 @@ class WebEntryEvent
$process->throwExceptionIfNotExistsUser($arrayData["USR_UID"], $this->arrayFieldNameForException["userUid"]); $process->throwExceptionIfNotExistsUser($arrayData["USR_UID"], $this->arrayFieldNameForException["userUid"]);
} }
if ($arrayData["WE_TYPE"] === "SINGLE" && empty($arrayData["DYN_UID"])) {
throw new \Exception(\G::LoadTranslation("ID_SELECT_DYNAFORM_USE_IN_CASE"));
}
if ($arrayData["WE_CALLBACK"] === "CUSTOM" && empty($arrayData["WE_CALLBACK_URL"])) { if ($arrayData["WE_CALLBACK"] === "CUSTOM" && empty($arrayData["WE_CALLBACK_URL"])) {
throw new \Exception(\G::LoadTranslation("ENTER_VALID_URL")); throw new \Exception(\G::LoadTranslation("ID_ENTER_VALID_URL"));
} }
} catch (\Exception $e) { } catch (\Exception $e) {
throw $e; throw $e;