From ef1112793a0f958cc2bd3f10184e0c7f43feaa54 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Tue, 17 Jun 2014 12:06:22 -0400 Subject: [PATCH 1/4] =?UTF-8?q?BUG-14775=20Adicion=20de=20bandera=20que=20?= =?UTF-8?q?habilita=20politicas=20de=20contrase=C3=B1a=20al=20momento=20de?= =?UTF-8?q?=20logueo=20de=20usuario.=20IMPROVEMENT.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/classes/model/UsersProperties.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/model/UsersProperties.php b/workflow/engine/classes/model/UsersProperties.php index 0b17ce1f2..6ece46e96 100755 --- a/workflow/engine/classes/model/UsersProperties.php +++ b/workflow/engine/classes/model/UsersProperties.php @@ -156,17 +156,17 @@ class UsersProperties extends BaseUsersProperties $aErrors[] = 'ID_PPP_MAXIMUM_LENGTH'; } if (PPP_NUMERICAL_CHARACTER_REQUIRED == 1) { - if (preg_match_all( '/[0-9]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0) { + if (preg_match_all( '/[0-9]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0 || $nowLogin) { $aErrors[] = 'ID_PPP_NUMERICAL_CHARACTER_REQUIRED'; } } if (PPP_UPPERCASE_CHARACTER_REQUIRED == 1) { - if (preg_match_all( '/[A-Z]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0) { + if (preg_match_all( '/[A-Z]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0 || $nowLogin) { $aErrors[] = 'ID_PPP_UPPERCASE_CHARACTER_REQUIRED'; } } if (PPP_SPECIAL_CHARACTER_REQUIRED == 1) { - if (preg_match_all( '/[��\\!|"@�#$~%�&�\/()=\'?��*+\-_.:,;]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0) { + if (preg_match_all( '/[��\\!|"@�#$~%�&�\/()=\'?��*+\-_.:,;]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0 || $nowLogin) { $aErrors[] = 'ID_PPP_SPECIAL_CHARACTER_REQUIRED'; } } From 1cb28a9a02278028e40c289c42e98e07e6687aa1 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Wed, 18 Jun 2014 10:06:34 -0400 Subject: [PATCH 2/4] BUG_12828 When not choosing a ldap provider an error is displayed When not choosing a ldap provider and pressing continue, an error is displayed and it`s text says "File: Edit.xml not exists.". --- .../authSources/authSourcesListNew.js | 62 ++++++++++--------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/workflow/engine/templates/authSources/authSourcesListNew.js b/workflow/engine/templates/authSources/authSourcesListNew.js index 2501319ea..a4e8be16c 100755 --- a/workflow/engine/templates/authSources/authSourcesListNew.js +++ b/workflow/engine/templates/authSources/authSourcesListNew.js @@ -93,36 +93,38 @@ var cboxAuthSourse = new Ext.form.ComboBox({ else window.location = 'authSources_New?AUTH_SOURCE_PROVIDER='+formAuthSourceOptoins.getForm().findField('AUTH_SOURCE_PROVIDER').getValue(); return false;*/ - formAuthSourceOptoins.getForm().submit({ - waitTitle : " ", - url: '../adminProxy/testingOption', - params: { - action : 'test', - optionAuthS: formAuthSourceOptoins.getForm().findField('AUTH_SOURCE_PROVIDER').getValue() - }, - method: 'POST', - waitMsg : _('ID_LOADING_GRID'), - timeout : 500, - success: function(f,a){ - resp = Ext.util.JSON.decode(a.response.responseText); -// alert(resp.optionAuthS);return false; -// alert(resp.sUID);return false; - if (resp.success){ - if(resp.optionAuthS=='ldap') -// window.location = 'authSources_kindof?sUID='+resp.sUID+'&sprovider='+resp.optionAuthS; - window.location = 'authSources_kindof?sprovider='+resp.optionAuthS; - else - window.location = 'authSources_New?AUTH_SOURCE_PROVIDER='+resp.optionAuthS; - } + if (formAuthSourceOptoins.getForm().findField('AUTH_SOURCE_PROVIDER').getValue() != '') { + formAuthSourceOptoins.getForm().submit({ + waitTitle : " ", + url: '../adminProxy/testingOption', + params: { + action : 'test', + optionAuthS: formAuthSourceOptoins.getForm().findField('AUTH_SOURCE_PROVIDER').getValue() + }, + method: 'POST', + waitMsg : _('ID_LOADING_GRID'), + timeout : 500, + success: function(f,a){ + resp = Ext.util.JSON.decode(a.response.responseText); + if (resp.success) { + if (resp.optionAuthS=='ldap') { + window.location = 'authSources_kindof?sprovider='+resp.optionAuthS; + } else { + window.location = 'authSources_New?AUTH_SOURCE_PROVIDER='+resp.optionAuthS; + } + } - }, - failure: function(f,a){ - 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')); - } + }, + failure: function(f,a){ + 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')); + } + } + }); + } else { + Ext.Msg.alert( _('ID_FAILURE'), _('ID_CHOOSE_PROVIDER')); } -}); } \ No newline at end of file From a25c04443b2330b659eb8316083224053c9118e7 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 18 Jun 2014 11:13:46 -0400 Subject: [PATCH 3/4] BUG-15237 Task Information on Case Information Menu not working SOLVED - For the task completed the index and task_uid was wrong. - A validation was added looking those id's, in file cases_Open.php. --- workflow/engine/methods/cases/cases_Open.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workflow/engine/methods/cases/cases_Open.php b/workflow/engine/methods/cases/cases_Open.php index cfa30701a..d9155b24a 100755 --- a/workflow/engine/methods/cases/cases_Open.php +++ b/workflow/engine/methods/cases/cases_Open.php @@ -208,10 +208,12 @@ try { break; default: //APP_STATUS <> DRAFT and TO_DO $_SESSION['APPLICATION'] = $sAppUid; - $_SESSION['INDEX'] = $iDelIndex != "" ? $iDelIndex : $oCase->getCurrentDelegationCase( $_GET['APP_UID'] ); + $_SESSION['INDEX'] = $oCase->getCurrentDelegationCase( $_GET['APP_UID'] ); $_SESSION['PROCESS'] = $aFields['PRO_UID']; $_SESSION['TASK'] = - 1; $_SESSION['STEP_POSITION'] = 0; + $Fields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX']); + $_SESSION['CURRENT_TASK'] = $Fields['TAS_UID']; require_once (PATH_METHODS . 'cases' . PATH_SEP . 'cases_Resume.php'); } From 8efd7e5b7877b0eb39d51f48c98b57e678ed7994 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 18 Jun 2014 11:51:39 -0400 Subject: [PATCH 4/4] BUG-15237 Task Information on Case Information Menu not working SOLVED - For the task completed the index and task_uid was wrong. - A validation was added looking those id's, in file cases_Open.php. - A validation was added for case paused. --- workflow/engine/methods/cases/cases_Open.php | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/methods/cases/cases_Open.php b/workflow/engine/methods/cases/cases_Open.php index d9155b24a..47a0bb32c 100755 --- a/workflow/engine/methods/cases/cases_Open.php +++ b/workflow/engine/methods/cases/cases_Open.php @@ -90,6 +90,7 @@ try { $_SESSION['PROCESS'] = $aFields['PRO_UID']; $_SESSION['TASK'] = - 1; $_SESSION['STEP_POSITION'] = 0; + $_SESSION['CURRENT_TASK'] = $aFields['TAS_UID']; require_once (PATH_METHODS . 'cases' . PATH_SEP . 'cases_Resume.php'); exit();