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

Merged in bugfix/PMC-44 (pull request #6745)

Browse Source 
PMC-44

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Fabio Guachalla
2019-01-18 15:11:24 +00:00
committed by Julio Cesar Laura Avendaño
parent 53535b554b d6ba05b655
commit 595d87d3d1
9 changed files with 167 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gulliver/js/ext/min/ext-all.js
View File

@@ -13,10 +13,8 @@ this.warning=function(title,msg,fn){Ext.MessageBox.show({id:'warningMessageBox',
this.error=function(title,msg,fn){Ext.MessageBox.show({id:'errorMessageBox',title:title,msg:msg,buttons:Ext.MessageBox.OK,animEl:'mb9',fn:fn!=undefined?fn:function(){},icon:Ext.MessageBox.ERROR});} this.error=function(title,msg,fn){Ext.MessageBox.show({id:'errorMessageBox',title:title,msg:msg,buttons:Ext.MessageBox.OK,animEl:'mb9',fn:fn!=undefined?fn:function(){},icon:Ext.MessageBox.ERROR});}
this.notify=function(title,msg,type,time) this.notify=function(title,msg,type,time)
{Ext.msgBoxSlider.msg(title,msg,type,time);} {Ext.msgBoxSlider.msg(title,msg,type,time);}
this.getBrowser=function() this.getBrowser=function(){var browsersList=["opera","msie","firefox","chrome","safari","trident"],browserMeta=navigator.userAgent.toLowerCase(),name='Unknown',version='',screen={width:Ext.getBody().getViewSize().width,height:Ext.getBody().getViewSize().height};for(var i=0;i<browsersList.length;i++){if((name==="")&&(browserMeta.indexOf(browsersList[i])!==-1)){name=browsersList[i];version=String(parseFloat(browserMeta.substr(browserMeta.indexOf(browsersList[i])+browsersList[i].length+1)));break;}}
{var browsersList=new Array("opera","msie","firefox","chrome","safari");var browserMeta=navigator.userAgent.toLowerCase();var name='Unknown';var version='';var screen={width:Ext.getBody().getViewSize().width,height:Ext.getBody().getViewSize().height};var so=Ext.isLinux?'Linux':(Ext.isWindows?'Windows':(Ext.isMac?'Mac OS':'Unknown'));for(var i=0;i<browsersList.length;i++){if((name=="")&&(browserMeta.indexOf(browsersList[i])!=-1)){name=browsersList[i];version=String(parseFloat(browserMeta.substr(browserMeta.indexOf(browsersList[i])+browsersList[i].length+1)));break;}} return{name:name,version:version,screen:screen}};this.createInfoPanel=function(url,params,columnsSize){var labelColumnWidth=170;var valueColumnWidth=350;params=params||{};if(typeof columnsSize!=='undefined'){labelColumnWidth=columnsSize[0]||labelColumnWidth;valueColumnWidth=columnsSize[1]||valueColumnWidth;}
return{name:name,version:version,screen:screen}}
this.createInfoPanel=function(url,params,columnsSize){var labelColumnWidth=170;var valueColumnWidth=350;params=params||{};if(typeof columnsSize!=='undefined'){labelColumnWidth=columnsSize[0]||labelColumnWidth;valueColumnWidth=columnsSize[1]||valueColumnWidth;}
return new Ext.grid.GridPanel({store:new Ext.data.GroupingStore({autoLoad:true,proxy:new Ext.data.HttpProxy({url:url,method:'POST'}),baseParams:params,reader:new Ext.data.JsonReader({fields:[{name:'label'},{name:'value'},{name:'section'}]}),groupField:'section'}),columns:[{width:labelColumnWidth,dataIndex:"label",renderer:function(v){return"<b><font class='selectText' color=\"#465070\">"+v+"</font></b>";},align:"right"},{width:valueColumnWidth,dataIndex:"value",renderer:function(v){return"<b class='selectText'>"+v+"</b>";}},{hidden:true,dataIndex:"section"}],autoHeight:true,columnLines:true,trackMouseOver:false,disableSelection:true,view:new Ext.grid.GroupingView({forceFit:true,headersDisabled:true,groupTextTpl:'{group}'}),loadMask:true});};this.cookie={create:function(name,value,days){if(days){var date=new Date();date.setTime(date.getTime()+(days*24*60*60*1000));var expires="; expires="+date.toGMTString();}else var expires="";document.cookie=name+"="+value+expires+"; path=/";},read:function(name){var nameEQ=name+"=";var ca=document.cookie.split(';');for(var i=0;i<ca.length;i++){var c=ca[i];while(c.charAt(0)==' ')c=c.substring(1,c.length);if(c.indexOf(nameEQ)==0)return c.substring(nameEQ.length,c.length);} return new Ext.grid.GridPanel({store:new Ext.data.GroupingStore({autoLoad:true,proxy:new Ext.data.HttpProxy({url:url,method:'POST'}),baseParams:params,reader:new Ext.data.JsonReader({fields:[{name:'label'},{name:'value'},{name:'section'}]}),groupField:'section'}),columns:[{width:labelColumnWidth,dataIndex:"label",renderer:function(v){return"<b><font class='selectText' color=\"#465070\">"+v+"</font></b>";},align:"right"},{width:valueColumnWidth,dataIndex:"value",renderer:function(v){return"<b class='selectText'>"+v+"</b>";}},{hidden:true,dataIndex:"section"}],autoHeight:true,columnLines:true,trackMouseOver:false,disableSelection:true,view:new Ext.grid.GroupingView({forceFit:true,headersDisabled:true,groupTextTpl:'{group}'}),loadMask:true});};this.cookie={create:function(name,value,days){if(days){var date=new Date();date.setTime(date.getTime()+(days*24*60*60*1000));var expires="; expires="+date.toGMTString();}else var expires="";document.cookie=name+"="+value+expires+"; path=/";},read:function(name){var nameEQ=name+"=";var ca=document.cookie.split(';');for(var i=0;i<ca.length;i++){var c=ca[i];while(c.charAt(0)==' ')c=c.substring(1,c.length);if(c.indexOf(nameEQ)==0)return c.substring(nameEQ.length,c.length);}
return null;},erase:function(name){Tools.createCookie(name,"",-1);}}} return null;},erase:function(name){Tools.createCookie(name,"",-1);}}}
var PMExt=new PMExtJSCommon();Ext.msgBoxSlider=function(){var msgCt;function createBox(t,s){return['<div class="msg">','<div class="x-box-tl"><div class="x-box-tr"><div class="x-box-tc"></div></div></div>','<div class="x-box-ml"><div class="x-box-mr"><div id="x-box-mc-inner" class="x-box-mc"><h3>',t,'</h3>',s,'</div></div></div>','<div class="x-box-bl"><div class="x-box-br"><div class="x-box-bc"></div></div></div>','</div>'].join('');} var PMExt=new PMExtJSCommon();Ext.msgBoxSlider=function(){var msgCt;function createBox(t,s){return['<div class="msg">','<div class="x-box-tl"><div class="x-box-tr"><div class="x-box-tc"></div></div></div>','<div class="x-box-ml"><div class="x-box-mr"><div id="x-box-mc-inner" class="x-box-mc"><h3>',t,'</h3>',s,'</div></div></div>','<div class="x-box-bl"><div class="x-box-br"><div class="x-box-bc"></div></div></div>','</div>'].join('');}

47
gulliver/js/ext/pmos-common.js
View File

@@ -69,30 +69,25 @@ PMExtJSCommon = function() {
Ext.msgBoxSlider.msg(title, msg, type, time); Ext.msgBoxSlider.msg(title, msg, type, time);
} }
this.getBrowser = function() this.getBrowser = function () {
{ var browsersList = ["opera", "msie", "firefox", "chrome", "safari", "trident"],
var browsersList = new Array("opera", "msie", "firefox", "chrome", "safari"); browserMeta = navigator.userAgent.toLowerCase(),
var browserMeta = navigator.userAgent.toLowerCase(); name = 'Unknown',
var name = 'Unknown'; version = '',
var version = ''; screen = {
var screen = { width: Ext.getBody().getViewSize().width,
width : Ext.getBody().getViewSize().width, height: Ext.getBody().getViewSize().height
height : Ext.getBody().getViewSize().height };
for (var i = 0; i < browsersList.length; i++) {
if ((name === "") && (browserMeta.indexOf(browsersList[i]) !== -1)) {
name = browsersList[i];
version = String(parseFloat(browserMeta.substr(browserMeta.indexOf(browsersList[i]) + browsersList[i].length + 1)));
break;
}
}
return {name: name, version: version, screen: screen}
}; };
var so = Ext.isLinux ? 'Linux' : ( Ext.isWindows ? 'Windows' : (Ext.isMac ? 'Mac OS' : 'Unknown') );
for (var i = 0; i < browsersList.length; i++){
if ((name == "") && (browserMeta.indexOf(browsersList[i]) != -1)){
name = browsersList[i];
version = String(parseFloat(browserMeta.substr(browserMeta.indexOf(browsersList[i]) + browsersList[i].length + 1)));
break;
}
}
return {name:name, version:version, screen: screen}
}
this.createInfoPanel = function (url, params, columnsSize) { this.createInfoPanel = function (url, params, columnsSize) {
var labelColumnWidth = 170; var labelColumnWidth = 170;
var valueColumnWidth = 350; var valueColumnWidth = 350;
@@ -562,11 +557,11 @@ function getBrowserTimeZoneOffset()
} }
/** /**
* This is the global state manager. By default all components that are * This is the global state manager. By default all components that are
* "state aware" check this class for state information if you don't pass them a * "state aware" check this class for state information if you don't pass them a
* custom state provider. In order for this class to be useful, it must be * custom state provider. In order for this class to be useful, it must be
* initialized with a provider when your application initializes. * initialized with a provider when your application initializes.
* *
* @param {string} cache * @param {string} cache
* @param {string} additionalPrefix * @param {string} additionalPrefix
* @returns {undefined} * @returns {undefined}

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

@@ -346,71 +346,70 @@ function G_Text(form, element, name)
this.parent = G_Field; this.parent = G_Field;
this.browser = {}; this.browser = {};
this.comma_separator = "."; this.comma_separator = ".";
/**
this.checkBrowser = function(){ * Gets the user client browser and its version
var nVer = navigator.appVersion; */
var nAgt = navigator.userAgent; this.checkBrowser = function () {
//alert(navigator.userAgent); var nAgt = navigator.userAgent.toLowerCase(),
var browserName = navigator.appName; browserName = navigator.appName,
var fullVersion = ''+parseFloat(navigator.appVersion); fullVersion = '' + parseFloat(navigator.appVersion),
var majorVersion = parseInt(navigator.appVersion,10); majorVersion,
var nameOffset,verOffset,ix; nameOffset,
verOffset,
ix;
// In Opera, the true version is after "Opera" or after "Version" // In Opera, the true version is after "Opera" or after "Version"
if ((verOffset=nAgt.indexOf("Opera"))!=-1) { if ((verOffset = nAgt.indexOf("opera")) !== -1) {
browserName = "Opera"; browserName = "Opera";
fullVersion = nAgt.substring(verOffset+6); fullVersion = nAgt.substring(verOffset + 6);
if ((verOffset=nAgt.indexOf("Version"))!=-1) if ((verOffset = nAgt.indexOf("version")) !== -1) {
fullVersion = nAgt.substring(verOffset+8); fullVersion = nAgt.substring(verOffset + 8);
} }
// In MSIE, the true version is after "MSIE" in userAgent // In MSIE, the true version is after "MSIE" or "Trident" in userAgent
else if ((verOffset=nAgt.indexOf("MSIE"))!=-1) { } else if ((verOffset = nAgt.indexOf("msie")) !== -1 || (verOffset = nAgt.indexOf("trident")) !== -1) {
browserName = "Microsoft Internet Explorer"; browserName = "Microsoft Internet Explorer";
fullVersion = nAgt.substring(verOffset+5); fullVersion = nAgt.substring(verOffset + 5);
} // In Chrome, the true version is after "Chrome"
// In Chrome, the true version is after "Chrome" } else if ((verOffset = nAgt.indexOf("chrome")) !== -1) {
else if ((verOffset=nAgt.indexOf("Chrome"))!=-1) { browserName = "Chrome";
browserName = "Chrome"; fullVersion = nAgt.substring(verOffset + 7);
fullVersion = nAgt.substring(verOffset+7); // In Safari, the true version is after "Safari" or after "Version"
} } else if ((verOffset = nAgt.indexOf("safari")) !== -1) {
// In Safari, the true version is after "Safari" or after "Version" browserName = "Safari";
else if ((verOffset=nAgt.indexOf("Safari"))!=-1) { fullVersion = nAgt.substring(verOffset + 7);
browserName = "Safari"; if ((verOffset = nAgt.indexOf("version")) !== -1)
fullVersion = nAgt.substring(verOffset+7); fullVersion = nAgt.substring(verOffset + 8);
if ((verOffset=nAgt.indexOf("Version"))!=-1) // In Firefox, the true version is after "Firefox"
fullVersion = nAgt.substring(verOffset+8); } else if ((verOffset = nAgt.indexOf("firefox")) !== -1) {
} browserName = "Firefox";
// In Firefox, the true version is after "Firefox" fullVersion = nAgt.substring(verOffset + 8);
else if ((verOffset=nAgt.indexOf("Firefox"))!=-1) { // In most other browsers, "name/version" is at the end of userAgent
browserName = "Firefox"; } else if ((nameOffset = nAgt.lastIndexOf(' ') + 1) <
fullVersion = nAgt.substring(verOffset+8); (verOffset = nAgt.lastIndexOf('/'))) {
} browserName = nAgt.substring(nameOffset, verOffset);
// In most other browsers, "name/version" is at the end of userAgent fullVersion = nAgt.substring(verOffset + 1);
else if ( (nameOffset=nAgt.lastIndexOf(' ')+1) < if (browserName.toLowerCase() === browserName.toUpperCase()) {
(verOffset=nAgt.lastIndexOf('/')) ) browserName = navigator.appName;
{ }
browserName = nAgt.substring(nameOffset,verOffset);
fullVersion = nAgt.substring(verOffset+1);
if (browserName.toLowerCase()==browserName.toUpperCase()) {
browserName = navigator.appName;
}
} }
// trim the fullVersion string at semicolon/space if present // trim the fullVersion string at semicolon/space if present
if ((ix=fullVersion.indexOf(";"))!=-1) if ((ix = fullVersion.indexOf(";")) !== -1) {
fullVersion=fullVersion.substring(0,ix); fullVersion = fullVersion.substring(0, ix);
if ((ix=fullVersion.indexOf(" "))!=-1) }
fullVersion=fullVersion.substring(0,ix); if ((ix = fullVersion.indexOf(" ")) !== -1) {
fullVersion = fullVersion.substring(0, ix);
}
majorVersion = parseInt(''+fullVersion,10); majorVersion = parseInt('' + fullVersion, 10);
if (isNaN(majorVersion)) { if (isNaN(majorVersion)) {
fullVersion = ''+parseFloat(navigator.appVersion); fullVersion = '' + parseFloat(navigator.appVersion);
majorVersion = parseInt(navigator.appVersion,10); majorVersion = parseInt(navigator.appVersion, 10);
} }
this.browser = { this.browser = {
name: browserName, name: browserName,
fullVersion: fullVersion, fullVersion: fullVersion,
majorVersion: majorVersion, majorVersion: majorVersion,
userAgent: navigator.userAgent userAgent: navigator.userAgent
}; };
}; };
@@ -3227,7 +3226,7 @@ var validateForm = function(sRequiredFields) {
var systemMessaggeInvalid = ""; var systemMessaggeInvalid = "";
if(invalid_fields.length > 0) { if(invalid_fields.length > 0) {
systemMessaggeInvalid += "\n \n" + _('ID_REQUIRED_FIELDS_GRID'); systemMessaggeInvalid += "\n \n" + _('ID_REQUIRED_FIELDS_GRID');
} }
if(fielEmailInvalid.length > 0) { if(fielEmailInvalid.length > 0) {

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

@@ -920,18 +920,11 @@ function G_DropDown(form,element,name)
{var me=this;this.parent=G_Field;this.parent(form,element,name);this.setContent=function(content) {var me=this;this.parent=G_Field;this.parent(form,element,name);this.setContent=function(content)
{dropDownSetOption(me,content);};if(!element)return;leimnud.event.add(this.element,'change',this.updateDepententFields);} {dropDownSetOption(me,content);};if(!element)return;leimnud.event.add(this.element,'change',this.updateDepententFields);}
G_DropDown.prototype=new G_Field();function G_Text(form,element,name) G_DropDown.prototype=new G_Field();function G_Text(form,element,name)
{var me=this;this.mType="text";this.parent=G_Field;this.browser={};this.comma_separator=".";this.checkBrowser=function(){var nVer=navigator.appVersion;var nAgt=navigator.userAgent;var browserName=navigator.appName;var fullVersion=''+parseFloat(navigator.appVersion);var majorVersion=parseInt(navigator.appVersion,10);var nameOffset,verOffset,ix;if((verOffset=nAgt.indexOf("Opera"))!=-1){browserName="Opera";fullVersion=nAgt.substring(verOffset+6);if((verOffset=nAgt.indexOf("Version"))!=-1) {var me=this;this.mType="text";this.parent=G_Field;this.browser={};this.comma_separator=".";this.checkBrowser=function(){var nAgt=navigator.userAgent.toLowerCase(),browserName=navigator.appName,fullVersion=''+parseFloat(navigator.appVersion),majorVersion,nameOffset,verOffset,ix;if((verOffset=nAgt.indexOf("opera"))!==-1){browserName="Opera";fullVersion=nAgt.substring(verOffset+6);if((verOffset=nAgt.indexOf("version"))!==-1){fullVersion=nAgt.substring(verOffset+8);}}else if((verOffset=nAgt.indexOf("msie"))!==-1||(verOffset=nAgt.indexOf("trident"))!==-1){browserName="Microsoft Internet Explorer";fullVersion=nAgt.substring(verOffset+5);}else if((verOffset=nAgt.indexOf("chrome"))!==-1){browserName="Chrome";fullVersion=nAgt.substring(verOffset+7);}else if((verOffset=nAgt.indexOf("safari"))!==-1){browserName="Safari";fullVersion=nAgt.substring(verOffset+7);if((verOffset=nAgt.indexOf("version"))!==-1)
fullVersion=nAgt.substring(verOffset+8);} fullVersion=nAgt.substring(verOffset+8);}else if((verOffset=nAgt.indexOf("firefox"))!==-1){browserName="Firefox";fullVersion=nAgt.substring(verOffset+8);}else if((nameOffset=nAgt.lastIndexOf(' ')+1)<(verOffset=nAgt.lastIndexOf('/'))){browserName=nAgt.substring(nameOffset,verOffset);fullVersion=nAgt.substring(verOffset+1);if(browserName.toLowerCase()===browserName.toUpperCase()){browserName=navigator.appName;}}
else if((verOffset=nAgt.indexOf("MSIE"))!=-1){browserName="Microsoft Internet Explorer";fullVersion=nAgt.substring(verOffset+5);} if((ix=fullVersion.indexOf(";"))!==-1){fullVersion=fullVersion.substring(0,ix);}
else if((verOffset=nAgt.indexOf("Chrome"))!=-1){browserName="Chrome";fullVersion=nAgt.substring(verOffset+7);} if((ix=fullVersion.indexOf(" "))!==-1){fullVersion=fullVersion.substring(0,ix);}
else if((verOffset=nAgt.indexOf("Safari"))!=-1){browserName="Safari";fullVersion=nAgt.substring(verOffset+7);if((verOffset=nAgt.indexOf("Version"))!=-1) majorVersion=parseInt(''+fullVersion,10);if(isNaN(majorVersion)){fullVersion=''+parseFloat(navigator.appVersion);majorVersion=parseInt(navigator.appVersion,10);}
fullVersion=nAgt.substring(verOffset+8);}
else if((verOffset=nAgt.indexOf("Firefox"))!=-1){browserName="Firefox";fullVersion=nAgt.substring(verOffset+8);}
else if((nameOffset=nAgt.lastIndexOf(' ')+1)<(verOffset=nAgt.lastIndexOf('/')))
{browserName=nAgt.substring(nameOffset,verOffset);fullVersion=nAgt.substring(verOffset+1);if(browserName.toLowerCase()==browserName.toUpperCase()){browserName=navigator.appName;}}
if((ix=fullVersion.indexOf(";"))!=-1)
fullVersion=fullVersion.substring(0,ix);if((ix=fullVersion.indexOf(" "))!=-1)
fullVersion=fullVersion.substring(0,ix);majorVersion=parseInt(''+fullVersion,10);if(isNaN(majorVersion)){fullVersion=''+parseFloat(navigator.appVersion);majorVersion=parseInt(navigator.appVersion,10);}
this.browser={name:browserName,fullVersion:fullVersion,majorVersion:majorVersion,userAgent:navigator.userAgent};};this.parent(form,element,name);if(element){this.prev=element.value;} this.browser={name:browserName,fullVersion:fullVersion,majorVersion:majorVersion,userAgent:navigator.userAgent};};this.parent(form,element,name);if(element){this.prev=element.value;}
this.validate='Any';this.mask='';this.required=false;this.formula='';this.key_Change=false;var doubleChange=false;function IsUnsignedInteger(YourNumber){var Template=/^d+$/;return(Template.test(YourNumber))?1:0;} this.validate='Any';this.mask='';this.required=false;this.formula='';this.key_Change=false;var doubleChange=false;function IsUnsignedInteger(YourNumber){var Template=/^d+$/;return(Template.test(YourNumber))?1:0;}
function replaceAll(text,busca,reemplaza){while(text.toString().indexOf(busca)!=-1){text=text.toString().replace(busca,reemplaza);} function replaceAll(text,busca,reemplaza){while(text.toString().indexOf(busca)!=-1){text=text.toString().replace(busca,reemplaza);}

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

@@ -978,7 +978,7 @@ class Bootstrap
// if userAgent (BROWSER) is MSIE we need special headers to avoid MSIE // if userAgent (BROWSER) is MSIE we need special headers to avoid MSIE
// behaivor. // behaivor.
$userAgent = strtolower($_SERVER ['HTTP_USER_AGENT']); $userAgent = strtolower($_SERVER ['HTTP_USER_AGENT']);
if (preg_match("/msie/i", $userAgent)) { if (preg_match("/msie|trident/i", $userAgent)) {
// if ( ereg("msie", $userAgent)) { // if ( ereg("msie", $userAgent)) {
header('Pragma: cache'); header('Pragma: cache');
@@ -2638,14 +2638,14 @@ class Bootstrap
} }
/** /**
* Set Language * Verify if the browser is Internet Explorer
*/ */
public static function isIE() public static function isIE()
{ {
$isIE = false; $isIE = false;
if (isset($_SERVER['HTTP_USER_AGENT'])) { if (isset($_SERVER['HTTP_USER_AGENT'])) {
$ua = htmlentities($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES, 'UTF-8'); $ua = htmlentities($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES, 'UTF-8');
if (preg_match('~MSIE|Internet Explorer~i', $ua) || (strpos($ua, 'Trident/7.0; rv:11.0') !== false)) { if (preg_match('/MSIE|Internet Explorer|Trident\d+rv:11.0/i', $ua) || (strpos($ua, 'Trident/7.0; Touch; rv:11.0') !== false)) {
$isIE = true; $isIE = true;
} }
} }

2
workflow/engine/methods/cases/cases_Derivate.php
View File

@@ -318,8 +318,8 @@ try {
try { try {
if(top.opener) { if(top.opener) {
top.opener.location.reload(); top.opener.location.reload();
top.close();
} }
top.close();
} catch(e) { } catch(e) {
} }
</script>"; </script>";

6
workflow/engine/methods/cases/main_init.php
View File

@@ -9,6 +9,8 @@ $oHeadPublisher->addContent("cases/main"); //Adding a html file .html.
$keyMem = "USER_PREFERENCES" . $_SESSION["USER_LOGGED"]; $keyMem = "USER_PREFERENCES" . $_SESSION["USER_LOGGED"];
$memcache = PMmemcached::getSingleton(config("system.workspace")); $memcache = PMmemcached::getSingleton(config("system.workspace"));
$openCaseIE = false;
if (($arrayConfig = $memcache->get($keyMem)) === false) { if (($arrayConfig = $memcache->get($keyMem)) === false) {
$conf->loadConfig($x, "USER_PREFERENCES", "", "", $_SESSION["USER_LOGGED"], ""); $conf->loadConfig($x, "USER_PREFERENCES", "", "", $_SESSION["USER_LOGGED"], "");
$arrayConfig = $conf->aConfig; $arrayConfig = $conf->aConfig;
@@ -86,6 +88,7 @@ if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) {
if (count($arrayDelIndex) === 1) { if (count($arrayDelIndex) === 1) {
//We will to open the case: one thread //We will to open the case: one thread
$openCaseIE = true;
$defaultOption = '../cases/open?APP_UID=' . $openAppUid . '&DEL_INDEX=' . $arrayDelIndex[0] . '&action=' . $action; $defaultOption = '../cases/open?APP_UID=' . $openAppUid . '&DEL_INDEX=' . $arrayDelIndex[0] . '&action=' . $action;
} else { } else {
//We will to show the list: more than one thread //We will to show the list: more than one thread
@@ -117,6 +120,7 @@ $urlProxy = 'casesMenuLoader?action=getAllCountersEnterprise&r=';
$oHeadPublisher->assign('regionTreePanel', $regionTreePanel); $oHeadPublisher->assign('regionTreePanel', $regionTreePanel);
$oHeadPublisher->assign('regionDebug', $regionDebug); $oHeadPublisher->assign('regionDebug', $regionDebug);
$oHeadPublisher->assign('openCaseIE', $openCaseIE);
$oHeadPublisher->assign("defaultOption", $defaultOption); //User menu permissions $oHeadPublisher->assign("defaultOption", $defaultOption); //User menu permissions
$oHeadPublisher->assign('urlProxy', $urlProxy); //sending the urlProxy to make $oHeadPublisher->assign('urlProxy', $urlProxy); //sending the urlProxy to make
$oHeadPublisher->assign("_nodeId", isset($confDefaultOption) ? $confDefaultOption : "PM_USERS"); //User menu permissions $oHeadPublisher->assign("_nodeId", isset($confDefaultOption) ? $confDefaultOption : "PM_USERS"); //User menu permissions
@@ -162,4 +166,4 @@ function getAuthorizationCode($client)
return $code; return $code;
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/

102
workflow/engine/templates/cases/main.js
View File

@@ -1,16 +1,18 @@
var PANEL_EAST_OPEN = false; var PANEL_EAST_OPEN = false,
var centerPanel; centerPanel,
var setFlag; setFlag,
var flagRefresh = true; flagRefresh = true,
var debugVarTpl = new Ext.Template('<span style="font-size:11">{value}</span>'); debugVarTpl = new Ext.Template('<span style="font-size:11">{value}</span>'),
var detailsText = '<i></i>'; detailsText = '<i></i>',
var debugTriggersDetailTpl = new Ext.Template('<pre style="font-size:10px"><code>{code}</code></pre>'); debugTriggersDetailTpl = new Ext.Template('<pre style="font-size:10px"><code>{code}</code></pre>'),
var propStore; propStore,
var triggerStore; triggerStore,
var result; result,
var _action = ''; _action = '',
//@var treeMenuItemsLoaded -> added to flag the "treeMenuItems" tree, to ensure that its onload event is executed just once //@var treeMenuItemsLoaded -> added to flag the "treeMenuItems" tree, to ensure that its onload event is executed just once
var treeMenuItemsLoaded = false; treeMenuItemsLoaded = false,
loader,
_BROWSER;
debugVarTpl.compile(); debugVarTpl.compile();
debugTriggersDetailTpl.compile(); debugTriggersDetailTpl.compile();
@@ -97,34 +99,56 @@ Ext.onReady(function(){
'render': function(tp){} 'render': function(tp){}
} }
}); });
/**
var loader = treeMenuItems.getLoader(); * Gets the user client browser and its version
loader.on("load", function() { * @return (object)
// it was added since the feature to reload a specific node of tree is now working */
if (! treeMenuItemsLoaded) { // this section of code should be executed once function getBrowserClient() {
document.getElementById('casesSubFrame').src = defaultOption; var browsers = ["opera", "msie", "firefox", "opera", "safari", "trident"],
infoBrowser = navigator.userAgent.toLowerCase(),
// check if a case was open directly versionBrowser,
if (defaultOption.indexOf('open') > -1) { currentBrowser = "";
//if it is, then update cases trees for (var i = 0; i < browsers.length; i++) {
updateCasesTree(); if ((currentBrowser === "") && (infoBrowser.indexOf(browsers[i]) !== -1)) {
} currentBrowser = browsers[i];
versionBrowser = String(parseFloat(infoBrowser.substr(infoBrowser.indexOf(browsers[i]) + browsers[i].length + 1)));
if(_nodeId !== ''){ return {name: currentBrowser, browser: currentBrowser, version: versionBrowser}
treePanel1 = Ext.getCmp('tree-panel'); }
if(treePanel1)
node = treePanel1.getNodeById(_nodeId);
if(node) {
node.select();
if (_nodeId === 'CASES_START_CASE') {
updateCasesTree();
}
} }
} return false;
treeMenuItemsLoaded = true;
} }
}); _BROWSER = getBrowserClient();
loader = treeMenuItems.getLoader();
loader.on("load", function () {
var treePanel1,
node;
// it was added since the feature to reload a specific node of tree is now working
if (!treeMenuItemsLoaded) { // this section of code should be executed once
if ((_BROWSER.name === "msie" || _BROWSER.name === "trident") && openCaseIE) {
parent.window.location.href = defaultOption;
} else {
document.getElementById('casesSubFrame').src = defaultOption;
// check if a case was open directly
if (defaultOption.indexOf('open') > -1) {
//if it is, then update cases trees
updateCasesTree();
}
if (_nodeId !== '') {
treePanel1 = Ext.getCmp('tree-panel');
if (treePanel1) {
node = treePanel1.getNodeById(_nodeId);
}
if (node) {
node.select();
if (_nodeId === 'CASES_START_CASE') {
updateCasesTree();
}
}
}
}
treeMenuItemsLoaded = true;
}
});
// set the root node // set the root node
var root = new Ext.tree.AsyncTreeNode({ var root = new Ext.tree.AsyncTreeNode({
@@ -649,7 +673,7 @@ Ext.app.menuLoader = Ext.extend(Ext.ux.tree.XmlTreeLoader, {
//} //}
}else if(attr.title){ }else if(attr.title){
attr.text = Ext.util.Format.htmlDecode(attr.title); attr.text = Ext.util.Format.htmlDecode(attr.title);
if( attr.cases_count ) if( attr.cases_count )
attr.text += ' (<label id="NOTIFIER_'+attr.id+'">' + attr.cases_count + '</label>)'; attr.text += ' (<label id="NOTIFIER_'+attr.id+'">' + attr.cases_count + '</label>)';

19
workflow/engine/templates/cases/open.js
View File

@@ -32,13 +32,14 @@ function formatAMPM(date, initVal) {
return strTime; return strTime;
}; };
function isBrowserIE(){ /**
if ( (navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1) ){ * Verify if the browser is Internet Explorer
return true; * @return {boolean}
} else { */
return false; function isBrowserIE() {
} var browserAgent = navigator.userAgent.toLowerCase();
}; return (browserAgent.indexOf("msie") !== -1) || (browserAgent.indexOf("trident") !== -1);
}
Ext.onReady(function(){ Ext.onReady(function(){
openToRevisePanel = function() { openToRevisePanel = function() {
@@ -157,7 +158,7 @@ Ext.onReady(function(){
tb.add(menu); tb.add(menu);
} }
} }
var olink = document.location.href; var olink = document.location.href;
if(olink.search("gmail") != -1){ if(olink.search("gmail") != -1){
Ext.getCmp('stepsMenu').hide(); Ext.getCmp('stepsMenu').hide();
@@ -229,7 +230,7 @@ Ext.onReady(function(){
if (node.attributes.url) { if (node.attributes.url) {
//Set load event //Set load event
if (navigator.userAgent.toLowerCase().indexOf("msie") != -1) { if (navigator.userAgent.toLowerCase().indexOf("msie") !== -1 || navigator.userAgent.toLowerCase().indexOf("trident") !== -1) {
document.getElementById("openCaseFrame").onreadystatechange = function () document.getElementById("openCaseFrame").onreadystatechange = function ()
{ {
if (document.getElementById("openCaseFrame").readyState == "complete") { if (document.getElementById("openCaseFrame").readyState == "complete") {