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

Merged in bugfix/HOR-4005 (pull request #6154)

Browse Source 
HOR-4005

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Marco Antonio Nina Mena
2017-10-30 16:32:18 +00:00
committed by Julio Cesar Laura Avendaño
parent bf2f884590 889cfaa892
commit 577df23797
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51758,3 +51758,10 @@ msgstr "Flow"
#: LABEL/ID_MAFE_f775fa07e143b2e671946a48af8f42ca #: LABEL/ID_MAFE_f775fa07e143b2e671946a48af8f42ca
msgid "versioning" msgid "versioning"
msgstr "versioning" msgstr "versioning"
# TRANSLATION
# LABEL/ID_SELECT_VARIABLE
#: LABEL/ID_SELECT_VARIABLE
msgid "Select Variable"
msgstr "Select Variable"

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

@@ -6285,7 +6285,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_MAFE_e6fe2cb291ace4c56d3f9481b3b963af','en','Select a language','2017-10-25') , ( 'LABEL','ID_MAFE_e6fe2cb291ace4c56d3f9481b3b963af','en','Select a language','2017-10-25') ,
( 'LABEL','ID_MAFE_e9cb217697088a98b1937d111d936281','en','Attachment','2017-10-25') , ( 'LABEL','ID_MAFE_e9cb217697088a98b1937d111d936281','en','Attachment','2017-10-25') ,
( 'LABEL','ID_MAFE_f1a76f66cca677c6e628d9ca58a6c8fc','en','Flow','2017-10-25') , ( 'LABEL','ID_MAFE_f1a76f66cca677c6e628d9ca58a6c8fc','en','Flow','2017-10-25') ,
( 'LABEL','ID_MAFE_f775fa07e143b2e671946a48af8f42ca','en','versioning','2017-10-25') ; ( 'LABEL','ID_MAFE_f775fa07e143b2e671946a48af8f42ca','en','versioning','2017-10-25'),
( 'LABEL','ID_SELECT_VARIABLE','en','Select Variable','2017-10-27');
INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('AD','','',' ','') , ('AD','','',' ','') ,

2
workflow/engine/methods/controls/varsAjax.php
View File

@@ -35,7 +35,7 @@ $_REQUEST['sSymbol']= isset($_REQUEST["sSymbol"])?$_REQUEST["sSymbol"]:'';
$_SERVER["QUERY_STRING"] = $filter->xssFilterHard($_SERVER["QUERY_STRING"]); $_SERVER["QUERY_STRING"] = $filter->xssFilterHard($_SERVER["QUERY_STRING"]);
$html = '<title>Upload Variable</title>'; $html = '<title>' . G::LoadTranslation('ID_SELECT_VARIABLE') . '</title>';
$html .= '<form action="uploader.php?'.$_SERVER["QUERY_STRING"].'&q=upload" onLoad="onLoad()" method="post" enctype="multipart/form-data" onsubmit="" style="height:0px;">'; $html .= '<form action="uploader.php?'.$_SERVER["QUERY_STRING"].'&q=upload" onLoad="onLoad()" method="post" enctype="multipart/form-data" onsubmit="" style="height:0px;">';
$html .= '<div id="d_variables">'; $html .= '<div id="d_variables">';
$html .= '<table width="90%" align="center">'; $html .= '<table width="90%" align="center">';