From 0a760f7de6813e5dd479c8b375e3d67fb6d7f17c Mon Sep 17 00:00:00 2001 From: dheeyi Date: Sat, 9 May 2015 13:17:31 -0400 Subject: [PATCH 1/2] PM-2695 Se corrigio ese error que solo ocurre en navegadores de tipo IE8 --- workflow/engine/templates/authSources/authSourcesEdit.js | 7 ++++++- .../engine/templates/authSources/authSourceskindof.js | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/workflow/engine/templates/authSources/authSourcesEdit.js b/workflow/engine/templates/authSources/authSourcesEdit.js index 76e845dbd..db394d455 100644 --- a/workflow/engine/templates/authSources/authSourcesEdit.js +++ b/workflow/engine/templates/authSources/authSourcesEdit.js @@ -327,7 +327,12 @@ Ext.onReady(function(){ Ext.Msg.alert('Failure', 'Server reported:'+a.response.status+' '+a.response.statusText); } if (a.failureType === Ext.form.Action.SERVER_INVALID){ - Ext.Msg.alert('Warning', 'you have an error'); + if(Ext.isIE){ + success = true; + window.location = 'authSources_List'; + }else{ + Ext.Msg.alert( _('ID_WARNING'), _('ID_YOU_HAVE_ERROR') ); + } } } }); diff --git a/workflow/engine/templates/authSources/authSourceskindof.js b/workflow/engine/templates/authSources/authSourceskindof.js index c26745472..c76731eaf 100644 --- a/workflow/engine/templates/authSources/authSourceskindof.js +++ b/workflow/engine/templates/authSources/authSourceskindof.js @@ -347,11 +347,18 @@ Ext.onReady(function(){ }, failure: function(f,a){ + console.log(a); + console.log(a.failureType); if (a.failureType === Ext.form.Action.CONNECT_FAILURE){ Ext.Msg.alert(_('ID_FAILURE'), _('ID_SERVER_REPORTED') + ':'+a.response.status+' '+a.response.statusText); } if (a.failureType === Ext.form.Action.SERVER_INVALID){ - Ext.Msg.alert( _('ID_WARNING'), _('ID_YOU_HAVE_ERROR') ); + if(Ext.isIE){ + success = true; + window.location = 'authSources_List'; + }else{ + Ext.Msg.alert( _('ID_WARNING'), _('ID_YOU_HAVE_ERROR') ); + } } } }); From e58d871190a7f874ae2876fb64e462a9ede74ec0 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Sat, 9 May 2015 13:21:25 -0400 Subject: [PATCH 2/2] PM-2695 Se soluciono ese error en navegadores de tipo IE --- .../engine/templates/authSources/authSourcesEdit.js | 12 ++++++------ .../templates/authSources/authSourceskindof.js | 12 +++++------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/workflow/engine/templates/authSources/authSourcesEdit.js b/workflow/engine/templates/authSources/authSourcesEdit.js index db394d455..6878e847e 100644 --- a/workflow/engine/templates/authSources/authSourcesEdit.js +++ b/workflow/engine/templates/authSources/authSourcesEdit.js @@ -327,12 +327,12 @@ Ext.onReady(function(){ Ext.Msg.alert('Failure', 'Server reported:'+a.response.status+' '+a.response.statusText); } if (a.failureType === Ext.form.Action.SERVER_INVALID){ - if(Ext.isIE){ - success = true; - window.location = 'authSources_List'; - }else{ - Ext.Msg.alert( _('ID_WARNING'), _('ID_YOU_HAVE_ERROR') ); - } + if(Ext.isIE){ + success = true; + window.location = 'authSources_List'; + }else{ + Ext.Msg.alert( _('ID_WARNING'), _('ID_YOU_HAVE_ERROR') ); + } } } }); diff --git a/workflow/engine/templates/authSources/authSourceskindof.js b/workflow/engine/templates/authSources/authSourceskindof.js index c76731eaf..46dd0b4eb 100644 --- a/workflow/engine/templates/authSources/authSourceskindof.js +++ b/workflow/engine/templates/authSources/authSourceskindof.js @@ -347,18 +347,16 @@ Ext.onReady(function(){ }, failure: function(f,a){ - console.log(a); - console.log(a.failureType); if (a.failureType === Ext.form.Action.CONNECT_FAILURE){ Ext.Msg.alert(_('ID_FAILURE'), _('ID_SERVER_REPORTED') + ':'+a.response.status+' '+a.response.statusText); } if (a.failureType === Ext.form.Action.SERVER_INVALID){ if(Ext.isIE){ - success = true; - window.location = 'authSources_List'; - }else{ - Ext.Msg.alert( _('ID_WARNING'), _('ID_YOU_HAVE_ERROR') ); - } + success = true; + window.location = 'authSources_List'; + }else{ + Ext.Msg.alert( _('ID_WARNING'), _('ID_YOU_HAVE_ERROR') ); + } } } });