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

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Marco Antonio Nina
2014-10-21 15:53:00 -04:00
parent e057de2da8 6a899ce9c5
commit a72131c4a3
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1307,7 +1307,7 @@ var G_Grid = function(oForm, sGridName){
document.getElementById(aAux[0]+']['+ aAux[1] + '][' + oField.sFieldName + ']').value = symbol+''+document.getElementById(aAux[0]+']['+ aAux[1] + '][' + oField.sFieldName + ']').value; document.getElementById(aAux[0]+']['+ aAux[1] + '][' + oField.sFieldName + ']').value = symbol+''+document.getElementById(aAux[0]+']['+ aAux[1] + '][' + oField.sFieldName + ']').value;
// return focus the field typed // return focus the field typed
if (typeof document.getElementById(domId) != 'undefined') { if ((typeof document.getElementById(domId) != 'object') && (typeof document.getElementById(domId) != 'undefined')) {
document.getElementById(domId).focus(); document.getElementById(domId).focus();
} }

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

@@ -1461,7 +1461,7 @@ if(typeof maskDecimal[1]!='undefined'){maskToPut=maskDecimal[1].length;}else{mas
maskToPut=2;else maskToPut=2;else
maskToPut=0;} maskToPut=0;}
document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value='';this.executeEvent(document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']'),'keypress');eval("document.getElementById('"+aAux[0]+']['+aAux[1]+']['+oField.sFieldName+"]').value = ("+sAux+').toFixed('+maskToPut+');');document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value=document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value.replace(/^\s*|\s*$/g,"");if(document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value=='NaN') document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value='';this.executeEvent(document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']'),'keypress');eval("document.getElementById('"+aAux[0]+']['+aAux[1]+']['+oField.sFieldName+"]').value = ("+sAux+').toFixed('+maskToPut+');');document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value=document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value.replace(/^\s*|\s*$/g,"");if(document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value=='NaN')
document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value='';var symbol=document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value.replace(/[0-9.\s]/g,'');this.executeEvent(document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']'),'keypress');document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value=document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value.replace('-','');document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value=symbol+''+document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value;if(typeof document.getElementById(domId)!='undefined'){document.getElementById(domId).focus();} document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value='';var symbol=document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value.replace(/[0-9.\s]/g,'');this.executeEvent(document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']'),'keypress');document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value=document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value.replace('-','');document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value=symbol+''+document.getElementById(aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']').value;if((typeof document.getElementById(domId)!='object')&&(typeof document.getElementById(domId)!='undefined')){document.getElementById(domId).focus();}
if(this.aFunctions.length>0){for(i=0;i<this.aFunctions.length;i++){oAux=document.getElementById('form['+this.sGridName+']['+aAux[1]+']['+this.aFunctions[i].sFieldName+']');if(oAux){if(oAux.name==aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']'){switch(this.aFunctions[i].sFunction){case'sum':this.sum(false,oAux);break;case'avg':this.avg(false,oAux);break;} if(this.aFunctions.length>0){for(i=0;i<this.aFunctions.length;i++){oAux=document.getElementById('form['+this.sGridName+']['+aAux[1]+']['+this.aFunctions[i].sFieldName+']');if(oAux){if(oAux.name==aAux[0]+']['+aAux[1]+']['+oField.sFieldName+']'){switch(this.aFunctions[i].sFunction){case'sum':this.sum(false,oAux);break;case'avg':this.avg(false,oAux);break;}
if(oAux.fireEvent){oAux.fireEvent('onchange');}else{var evObj=document.createEvent('HTMLEvents');evObj.initEvent('change',true,true);oAux.dispatchEvent(evObj);}}}}}}else{new leimnud.module.app.alert().make({label:"Check your formula!\n\n"+oField.sFormula});}};this.deleteGridRownomsg=function(sRow){var i,iRow,iRowAux,oAux,ooAux;sRow=sRow.replace('[','');sRow=sRow.replace(']','');iRow=Number(sRow);deleteRowOnDynaform(this,iRow);iRowAux=iRow+1;while(iRowAux<=(this.oGrid.rows.length-2)){for(i=1;i<this.oGrid.rows[iRowAux-1].cells.length;i++){var oCell1=this.oGrid.rows[iRowAux-1].cells[i];var oCell2=this.oGrid.rows[iRowAux].cells[i];switch(oCell1.innerHTML.replace(/^\s+|\s+$/g,'').substr(0,6).toLowerCase()){case'<input':aObjects1=oCell1.getElementsByTagName('input');aObjects2=oCell2.getElementsByTagName('input');if(aObjects1&&aObjects2){if(aObjects1[0].type=='checkbox'){aObjects1[0].checked=aObjects2[0].checked;} if(oAux.fireEvent){oAux.fireEvent('onchange');}else{var evObj=document.createEvent('HTMLEvents');evObj.initEvent('change',true,true);oAux.dispatchEvent(evObj);}}}}}}else{new leimnud.module.app.alert().make({label:"Check your formula!\n\n"+oField.sFormula});}};this.deleteGridRownomsg=function(sRow){var i,iRow,iRowAux,oAux,ooAux;sRow=sRow.replace('[','');sRow=sRow.replace(']','');iRow=Number(sRow);deleteRowOnDynaform(this,iRow);iRowAux=iRow+1;while(iRowAux<=(this.oGrid.rows.length-2)){for(i=1;i<this.oGrid.rows[iRowAux-1].cells.length;i++){var oCell1=this.oGrid.rows[iRowAux-1].cells[i];var oCell2=this.oGrid.rows[iRowAux].cells[i];switch(oCell1.innerHTML.replace(/^\s+|\s+$/g,'').substr(0,6).toLowerCase()){case'<input':aObjects1=oCell1.getElementsByTagName('input');aObjects2=oCell2.getElementsByTagName('input');if(aObjects1&&aObjects2){if(aObjects1[0].type=='checkbox'){aObjects1[0].checked=aObjects2[0].checked;}
aObjects1[0].value=aObjects2[0].value;} aObjects1[0].value=aObjects2[0].value;}

2
workflow/engine/methods/login/login.php
View File

@@ -26,7 +26,7 @@
$browserSupported = G::checkBrowserCompatibility(); $browserSupported = G::checkBrowserCompatibility();
if ($browserSupported==false){ if ($browserSupported==false){
if(!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == ""){ if(!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == ""){
G::SendTemporalMessage ('ID_BROWSER_NOT_SUPPORTED', 'warning'); G::SendTemporalMessage ('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning');
} }
} }

2
workflow/engine/methods/login/sysLogin.php
View File

@@ -26,7 +26,7 @@
$browserSupported = G::checkBrowserCompatibility(); $browserSupported = G::checkBrowserCompatibility();
if ($browserSupported==false){ if ($browserSupported==false){
if(!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == ""){ if(!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == ""){
G::SendTemporalMessage ('ID_BROWSER_NOT_SUPPORTED', 'warning'); G::SendTemporalMessage ('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning');
} }
} }