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

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-682

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2014-10-23 11:47:48 -04:00
parent 83a2ecc61b 0298c64de7
commit 3255b70f16
25 changed files with 62 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gulliver/js/form/core/form.js
View File

@@ -1474,10 +1474,10 @@ function G_Text(form, element, name)
}
if (me.browser.name == 'Microsoft Internet Explorer' || me.browser.name == 'Netscape'){
if (event.preventDefault) {
event.preventDefault();
if (window.event.preventDefault) {
window.event.preventDefault();
} else {
event.returnValue = false;
window.event.returnValue = false;
}
}

2
gulliver/js/maborak/core/maborak.js
View File

@@ -1061,7 +1061,7 @@ if(pressKey==46){me.applyMask(256);}
else{me.applyMask(pressKey);}
if(updateOnChange){me.sendOnChange();}}
if(me.browser.name=='Firefox'){if(keyCode==0)return true;}
if(me.browser.name=='Microsoft Internet Explorer'||me.browser.name=='Netscape'){if(event.preventDefault){event.preventDefault();}else{event.returnValue=false;}}
if(me.browser.name=='Microsoft Internet Explorer'||me.browser.name=='Netscape'){if(window.event.preventDefault){window.event.preventDefault();}else{window.event.returnValue=false;}}
if(me.browser.name=='Chrome'||me.browser.name=='Safari'){event.returnValue=false;}
else{return false;}}};if(this.element){this.element.onblur=function(event)
{var evt=event||window.event;var keyPressed=evt.which||evt.keyCode;if((me.mask!='')&&((me.mType=='currency')||(me.mType=='percentage')||((me.validate=="Real")&&(me.mType=='text')))&&(me.mask.indexOf('-')==-1)&&(me.element.value!='')){masks=me.mask;aMasks=masks.split(';');for(m=0;m<aMasks.length;m++){var separatorField=",";if(typeof(me.comma_separator)!='undefined'){separatorField=me.comma_separator;}else{txtRealMask=aMasks[m].split('');p=txtRealMask.length-1;for(;p>=0;p--){if(txtRealMask[p]!='#'&&txtRealMask[p]!='%'&&txtRealMask[p]!=' '){separatorField=txtRealMask[p];break;}}}

2
gulliver/system/class.g.php
View File

@@ -5565,7 +5565,7 @@ class G
$clean = trim(str_replace($strip, "", strip_tags($string)));
$clean = preg_replace('/\s+/', "-", $clean);
$clean = ($alpha) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean ;
$clean = ($force_lowercase) ? (function_exists('mb_strtolower')) ? mb_strtolower($clean, 'UTF-8') : strtolower($clean) : $clean;
$clean = ($lowercase) ? (function_exists('mb_strtolower')) ? mb_strtolower($clean, 'UTF-8') : strtolower($clean) : $clean;
return $clean;
}
}

6
gulliver/system/class.xmlform.php
View File

@@ -3746,7 +3746,11 @@ class XmlForm_Field_Listbox extends XmlForm_Field
$arrayAux = array();
foreach ($value as $index2 => $value2) {
$arrayAux[] = $value2 . "";
if (!is_array($value2)) {
$arrayAux[] = $value2 . "";
} else {
$arrayAux[] = "";
}
}
$value = $arrayAux;

6
rbac/engine/xmlform/login/noViewPage.xml
View File

@@ -7,12 +7,12 @@
</title>
<subtitle1 type="subtitle" >
<es>The account you are logged in under does not have enough security privileges to view this page</es>
<en>The account you are logged in under does not have enough security privileges to view this page</en>
<es>The user account which you are currently logged in does not have security privileges to view this page</es>
<en>The user account which you are currently logged in does not have security privileges to view this page</en>
</subtitle1>
<subtitle2 type='subtitle'>
<en>Please press back button to continue working with this system.</en>
<en>Please press the 'back' button to continue working with this system.</en>
<es>Por favor presione el boton Regresar.</es>
</subtitle2>

13
workflow/engine/controllers/adminProxy.php
View File

@@ -1368,7 +1368,14 @@ class adminProxy extends HttpProxyController
//License Information:
$activeLicense = $licenseManager->getActiveLicense();
$params['license'] = $licenseManager;
$licenseInfo = array();
$noInclude = array('licensedfeaturesList', 'result', 'serial');
foreach ($licenseManager as $index => $value) {
if (!in_array($index, $noInclude)) {
$licenseInfo[$index] = G::sanitizeInput($value);
}
}
$params['license'] = $licenseInfo;
//Operative System version (Linux, Windows)
try {
@@ -1391,9 +1398,9 @@ class adminProxy extends HttpProxyController
//ProcessMaker Version
$params['pmVersion'] = System::getVersion();
if (file_exists(PATH_DATA. 'log/upgrades.log')) {
$params['pmUpgrade'] = file_get_contents(PATH_DATA. 'log/upgrades.log', 'r');
$params['pmUpgrade'] = serialize(file_get_contents(PATH_DATA. 'log/upgrades.log', 'r'));
} else {
$params['pmUpgrade'] = G::LoadTranslation('ID_UPGRADE_NEVER_UPGRADE');
$params['pmUpgrade'] = serialize(G::LoadTranslation('ID_UPGRADE_NEVER_UPGRADE'));
}
//Database server Version (MySQL version)

4
workflow/engine/templates/home/appListSearch.html
View File

@@ -294,7 +294,7 @@
</select>
</div>
<div style = "float: right;"> <b>{$processTitle}:</b>
<select id="comboProcess" onchange="redirect();" style="width: 200px">
<select id="comboProcess" onchange="redirect();" style="width: 220px">
{foreach from=$processValues key=k item=VALUE}
<option value="{$VALUE[0]}">{$VALUE[1]}</option>
{/foreach}
@@ -311,7 +311,7 @@
<input type="button" class="fontText" onclick="setTextSearch();" tabindex="2" value=" x ">
</div>
<div style = "float: right;"><b>{$searchTitle}:</b>
<input type="text" size="27" maxlength="60" value="" id='searchText' placeholder="{$searchTitle}...">
<input type="text" size="24" maxlength="60" value="" id='searchText' placeholder="{$searchTitle}...">
</div>

2
workflow/engine/xmlform/additionalTables/additionalTablesToImport.xml
View File

@@ -4,7 +4,7 @@
<en><![CDATA[Import PMTables]]></en>
</TITLE1>
<MAX_FILE_SIZE type="edit" mode="view">
<en><![CDATA[Max upload file size in bytes]]></en>
<en><![CDATA[Maximum upload file size in bytes]]></en>
</MAX_FILE_SIZE>
<FILENAME type="file">
<en><![CDATA[File]]></en>

2
workflow/engine/xmlform/dynaforms/fields/date.xml
View File

@@ -31,7 +31,7 @@ SELECT XMLNODE_NAME, TYPE FROM dynaForm WHERE XMLNODE_NAME = @@PME_XMLNODE_NAME
<en><![CDATA[Relative Start and End Dates]]></en>
</PME_SUBTITLE3a>
<PMED_AFTERBEFORE_DESC type="subtitle" defaultvalue="1m" enableHtml="1">
<en><![CDATA[<b>Data Codes:</b> A number followed by a letter to indicate the unit of time (d=day m=month y=year).<br/>Use negative numbers for past dates and positive numbers for future dates<br /> <b>NOTE.</b> When these relative dates are set have the priority, leave empty to use <i>Start and End dates</i>.]]></en>
<en><![CDATA[<b>Data Codes:</b> A number followed by a letter to indicate the unit of time (d=day m=month y=year).<br/>Use negative numbers for past dates and positive numbers for future dates.<br /> <b>NOTE:</b> These relative dates have priority. If left empty, then the <i>Start and End dates</i> will be used."]]></en>
</PMED_AFTERBEFORE_DESC>
<PME_BEFOREDATE type="text" defaultvalue="">
<en><![CDATA[Start Relative Date]]></en>

2
workflow/engine/xmlform/inputdocs/inputdocs_Edit.xml
View File

@@ -43,7 +43,7 @@
</INP_DOC_MAX_FILESIZE_UNIT>
<INP_DOC_UPLOAD_MAX_FILESIZE_LABEL type="text" maxlength="30" validate="Any" size="10" mode="view">
<en>Max upload file size</en>
<en>Maximum upload file size</en>
</INP_DOC_UPLOAD_MAX_FILESIZE_LABEL>
<BTN_CANCEL type="button" onclick="cancel();">

4
workflow/engine/xmlform/login/noViewPage.xml
View File

@@ -3,8 +3,8 @@
<title type="title"><en><![CDATA[You don't have permission]]></en></title>
<subtitle1 type="subtitle"><en><![CDATA[The account you are logged in under does not have enough security privileges to view this page]]></en></subtitle1>
<subtitle1 type="subtitle"><en><![CDATA[The user account which you are currently logged in does not have security privileges to view this page]]></en></subtitle1>
<subtitle2 type="subtitle"><en><![CDATA[Please press back button to continue working with this system.]]></en></subtitle2>
<subtitle2 type="subtitle"><en><![CDATA[Please press the 'back' button to continue working with this system.]]></en></subtitle2>
</dynaForm>

2
workflow/engine/xmlform/processes/processes_Edit.xml
View File

@@ -56,7 +56,7 @@ WHERE
</PRO_TRI_UNPAUSED>
<PRO_TYPE_PROCESS type="dropdown" defaultvalue="PUBLIC" colWidth="80" titleAlign="left" align="left">
<en>
Type of process (only owner can edit the private processes)
Type of process (only owners can edit private processes)
<option name="PUBLIC">Public</option>
<option name="PRIVATE">Private</option>
</en>

2
workflow/engine/xmlform/processes/processes_ImportExisting.xml
View File

@@ -4,7 +4,7 @@
<en><![CDATA[<div align="center">Importing Existing Process</div>]]></en>
</title>
<TITLE1 type="subtitle">
<en><![CDATA[The process you are trying to import already exist. Please select one of the following options to continue:]]></en>
<en><![CDATA[The process you are trying to import already exists. Please select one of the following options to continue:]]></en>
</TITLE1>
<IMPORT_OPTION type="radiogroup">
<en><![CDATA[]]><option name="1"><![CDATA[Update the current process, overwriting all tasks and steps]]></option><option name="2"><![CDATA[Disable the current process and create a new version of the process]]></option><option name="3"><![CDATA[Create a completely new process without changing the current process]]></option></en>

2
workflow/engine/xmlform/processes/processes_ImportExistingXpdl.xml
View File

@@ -4,7 +4,7 @@
<en><![CDATA[<div align="center">Importing Existing Process</div>]]></en>
</title>
<TITLE1 type="subtitle">
<en><![CDATA[The process you are trying to import already exist. Please select one of the following options to continue:]]></en>
<en><![CDATA[The process you are trying to import already exists. Please select one of the following options to continue:]]></en>
</TITLE1>
<IMPORT_OPTION type="radiogroup">
<en><![CDATA[]]><option name="1"><![CDATA[Update the current process, overwriting all tasks and steps]]></option><option name="2"><![CDATA[Disable the current process and create a new version of the process]]></option><option name="3"><![CDATA[Create a completely new process without changing the current process]]></option></en>

4
workflow/engine/xmlform/reportTables/reportTables_Edit.html
View File

@@ -28,7 +28,7 @@
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.REP_TAB_NAME}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$REP_TAB_TYPE}</td>
<td class="FormLabel" width="{$form_labelWidth}">{$REP_TAB_TYPE}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.REP_TAB_TYPE} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.REP_TAB_TYPE}</td>
</tr>
@@ -56,4 +56,4 @@
{$form.JS}
</script>
</form>
</form>

54
workflow/engine/xmlform/reportTables/reportTables_Edit.xml
View File

@@ -82,13 +82,16 @@ function cancel(){
function reportTablesSave(form)
{
var bContinue = true;
if (getField('REP_TAB_TITLE').value == '') {
bContinue = false;
if (getField("REP_TAB_TITLE").value.trim() == "") {
new leimnud.module.app.alert().make({label: _("ID_TITLE_REQUIRED")});
return false;
}
if (getField('REP_TAB_NAME').value == '') {
bContinue = false;
if (getField("REP_TAB_NAME").value.trim() == ""){
new leimnud.module.app.alert().make({label: _("ID_NAME_REQUIRED")});
return false;
}
var j = 0;
if (getField('REP_TAB_TYPE').value == 'NORMAL') {
var i;
@@ -100,39 +103,18 @@ function reportTablesSave(form)
}
}
if ((j < 1) || (j > 80)) {
bContinue = false;
}
}
else {
if (getField('REP_TAB_GRID').value == '') {
bContinue = false;
}
}
if (bContinue) {
ajax_post(form.action, form, 'POST');
//currentPopupWindow.remove();
//@#PAGED_TABLE_ID.refresh();
history.back();
}
else {
if (getField('REP_TAB_TYPE').value == 'NORMAL') {
if (j == 0) {
new leimnud.module.app.alert().make({
label:'@G::LoadTranslation(ID_PLEASE_ENTER_REQUIRED_FIELDS)'
});
}
else {
new leimnud.module.app.alert().make({
label:'@G::LoadTranslation(ID_PLEASE_SELECT_MAX_X_FIELDS)'
});
}
}
else {
new leimnud.module.app.alert().make({
label:'@G::LoadTranslation(ID_PLEASE_ENTER_REQUIRED_FIELDS)'
});
new leimnud.module.app.alert().make({label: _("ID_SELECT_LEAST_FIELD")});
return false;
}
} else {
if (getField("REP_TAB_GRID").value == "") {
new leimnud.module.app.alert().make({label: _("ID_GRID_FIELDS_REQUIRED")});
return false;
}
}
ajax_post(form.action, form, 'POST');
history.back();
}
function reportTablesDelete(sUID)

2
workflow/engine/xmlform/reports/report1.xml
View File

@@ -20,6 +20,6 @@
<en><![CDATA[Average (Hours)]]></en>
</PROMEDIO>
<RPT_VIEW type="link" colWidth="60" link="#" onclick="panDel('@#PRO_UID');return false;">
<en><![CDATA[Detaills]]></en>
<en><![CDATA[Details]]></en>
</RPT_VIEW>
</dynaForm>

2
workflow/engine/xmlform/services/serviceMessage.xml
View File

@@ -4,6 +4,6 @@
<en><![CDATA[Information]]></en>
</Title>
<Subtitle type="subtitle" enablehtml="0" btn_cancel="Cancel">
<en><![CDATA[The access for the service is currently unavailable from the processmaker web interface.]]></en>
<en><![CDATA[Access to the service is currently unavailable from the ProcessMaker web interface.]]></en>
</Subtitle>
</dynaForm>

2
workflow/engine/xmlform/setup/pluginImport.xml
View File

@@ -4,7 +4,7 @@
<en><![CDATA[Import Plugin]]></en>
</TITLE1>
<MAX_FILE_SIZE type="edit" mode="view">
<en><![CDATA[Max upload file size in bytes]]></en>
<en><![CDATA[Maximum upload file size in bytes]]></en>
</MAX_FILE_SIZE>
<PLUGIN_FILENAME type="file">
<en><![CDATA[File]]></en>

2
workflow/engine/xmlform/setup/upgrade.xml
View File

@@ -7,7 +7,7 @@
<en><![CDATA[Current Version]]></en>
</PM_VERSION>
<MAX_FILE_SIZE type="edit" mode="view">
<en><![CDATA[Max upload file size in bytes]]></en>
<en><![CDATA[Maximum upload file size in bytes]]></en>
</MAX_FILE_SIZE>
<UPGRADE_FILENAME type="file">
<en><![CDATA[File]]></en>

2
workflow/engine/xmlform/setup/uplogo.xml
View File

@@ -4,7 +4,7 @@
<en><![CDATA[Upload your logo]]></en>
</TITLE1>
<MAX_FILE_SIZE type="edit" mode="view">
<en><![CDATA[Max upload file size in bytes]]></en>
<en><![CDATA[Maximum upload file size in bytes]]></en>
</MAX_FILE_SIZE>
<LOGO_FILENAME type="file">
<en><![CDATA[File]]></en>

2
workflow/engine/xmlform/users/myInfo2.xml
View File

@@ -109,7 +109,7 @@ SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '000
</TITLEPREF>
<PREF_DEFAULT_LANG type="dropdown"><![CDATA[
SELECT LAN_ID, LAN_NAME FROM LANGUAGE WHERE LAN_ENABLED = '1' ORDER BY LAN_WEIGHT DESC
]]><en><![CDATA[Default languaje]]></en></PREF_DEFAULT_LANG>
]]><en><![CDATA[Default language]]></en></PREF_DEFAULT_LANG>
<PREF_DEFAULT_MENUSELECTED type="dropdown" sqlconnection="dbarray">
SELECT * FROM menutab
<en><![CDATA[Default menu option]]></en>

2
workflow/engine/xmlform/users/myInfoView2.xml
View File

@@ -80,7 +80,7 @@
</TITLEPREF>
<PREF_DEFAULT_LANG type="dropdown"><![CDATA[
SELECT LAN_ID, LAN_NAME FROM LANGUAGE WHERE LAN_ENABLED = '1' ORDER BY LAN_WEIGHT DESC
]]><en><![CDATA[Default languaje]]></en></PREF_DEFAULT_LANG>
]]><en><![CDATA[Default language]]></en></PREF_DEFAULT_LANG>
<PREF_DEFAULT_MENUSELECTED type="dropdown" sqlconnection="dbarray">
SELECT * FROM menutab
<en><![CDATA[Default menu option]]></en>

2
workflow/engine/xmlform/users/users_EditRT.xml
View File

@@ -86,7 +86,7 @@
</USR_RESUME>
-->
<MAX_FILES_SIZE type="edit" mode="view">
<en><![CDATA[Max upload file size]]></en>
<en><![CDATA[Maximum upload file size]]></en>
</MAX_FILES_SIZE>
<SUBMIT type="button" onclick="verifyUserInformation(this.form);" group="1">
<en><![CDATA[Save]]></en>

2
workflow/engine/xmlform/users/users_New.xml
View File

@@ -92,7 +92,7 @@ SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '000
</USR_RESUME>
-->
<MAX_FILES_SIZE type="edit" mode="view">
<en><![CDATA[Max upload file size]]></en>
<en><![CDATA[Maximum upload file size]]></en>
</MAX_FILES_SIZE>
<BTN_CANCEL type="button" onclick="cancel();">
<en><![CDATA[Cancel]]></en>