From 59bf5dd6d7872f33a80aaa0568e85a46632aae24 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Thu, 15 Nov 2012 16:46:44 -0400 Subject: [PATCH 1/3] Fix little bug when edit intermediate events --- workflow/engine/methods/events/eventsEdit.php | 2 +- workflow/engine/methods/events/eventsNew.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/methods/events/eventsEdit.php b/workflow/engine/methods/events/eventsEdit.php index 46cf4d764..5454afc8b 100755 --- a/workflow/engine/methods/events/eventsEdit.php +++ b/workflow/engine/methods/events/eventsEdit.php @@ -66,7 +66,7 @@ foreach ($aTriggersList as $i => $v) { $aTriggersList[$i]['TRI_TITLE'] = (strlen( $aTriggersList[$i]['TRI_TITLE'] ) > 32) ? substr( $aTriggersList[$i]['TRI_TITLE'], 0, 32 ) . '...' : $aTriggersList[$i]['TRI_TITLE']; } -$aTriggersList = array_merge( Array ($aTriggersFileds, $aTriggersList )); +$aTriggersList = array_merge( $aTriggersFileds, $aTriggersList ); $_DBArray['tasks'] = $aTasks; $_DBArray['TMP_TRIGGERS'] = $aTriggersList; diff --git a/workflow/engine/methods/events/eventsNew.php b/workflow/engine/methods/events/eventsNew.php index f829c4009..ba0d32ae8 100755 --- a/workflow/engine/methods/events/eventsNew.php +++ b/workflow/engine/methods/events/eventsNew.php @@ -55,7 +55,7 @@ foreach ($aTriggersList as $i => $v) { $aTriggersList[$i]['TRI_TITLE'] = (strlen( $aTriggersList[$i]['TRI_TITLE'] ) > 32) ? substr( $aTriggersList[$i]['TRI_TITLE'], 0, 32 ) . '...' : $aTriggersList[$i]['TRI_TITLE']; } -$aTriggersList = array_merge( Array ($aTriggersFileds), $aTriggersList ); +$aTriggersList = array_merge( $aTriggersFileds, $aTriggersList ); $_DBArray['tasks'] = $aTasks; $_DBArray['TMP_TRIGGERS'] = $aTriggersList; From 97cef89539e17cf5c0883dafa408dc84a3c990eb Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Fri, 16 Nov 2012 10:05:20 -0400 Subject: [PATCH 2/3] BUG 8391 "Request that an "Edit" button be added to the..." SOLVED - New feature - Request that an "Edit" button be added to the page to view the profile of a particular user - Added edit button in Summary view * Available from version 2.0.46 --- workflow/engine/classes/model/Users.php | 6 +++--- workflow/engine/methods/users/usersAjax.php | 4 ---- workflow/engine/methods/users/usersGroups.php | 17 ++++++++++------- workflow/engine/templates/users/usersGroups.js | 14 +++++++++++--- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php index 469c944ca..7197e83ed 100755 --- a/workflow/engine/classes/model/Users.php +++ b/workflow/engine/classes/model/Users.php @@ -138,9 +138,9 @@ class Users extends BaseUsers $aIsoSubdivision = IsoSubdivision::findById( $aFields['USR_COUNTRY'], $aFields['USR_CITY'] ); $aIsoLocation = IsoLocation::findById( $aFields['USR_COUNTRY'], $aFields['USR_CITY'], $aFields['USR_LOCATION'] ); - $aFields['USR_COUNTRY_NAME'] = $aIsoCountry['IC_NAME']; - $aFields['USR_CITY_NAME'] = $aIsoSubdivision['IS_NAME']; - $aFields['USR_LOCATION_NAME'] = $aIsoLocation['IL_NAME']; + $aFields["USR_COUNTRY_NAME"] = (!empty($aIsoCountry["IC_NAME"]))? $aIsoCountry["IC_NAME"] : ""; + $aFields["USR_CITY_NAME"] = (!empty($aIsoSubdivision["IS_NAME"]))? $aIsoSubdivision["IS_NAME"] : ""; + $aFields["USR_LOCATION_NAME"] = (!empty($aIsoLocation["IL_NAME"]))? $aIsoLocation["IL_NAME"] : ""; $result = $aFields; diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php index 70e7f313a..642fce848 100644 --- a/workflow/engine/methods/users/usersAjax.php +++ b/workflow/engine/methods/users/usersAjax.php @@ -489,10 +489,6 @@ switch ($_POST['action']) { $aFields['CASES_MENUSELECTED_NAME'] = $casesMenuSelected; - $aFields['USR_COUNTRY_NAME'] = (! empty( $aFields['USR_COUNTRY_NAME'] )) ? $aFields['USR_COUNTRY_NAME'] : ''; - $aFields['USR_CITY_NAME'] = (! empty( $aFields['USR_CITY_NAME'] )) ? $aFields['USR_CITY_NAME'] : ''; - $aFields['USR_LOCATION_NAME'] = (! empty( $aFields['USR_LOCATION_NAME'] )) ? $aFields['USR_LOCATION_NAME'] : ''; - $result->success = true; $result->user = $aFields; diff --git a/workflow/engine/methods/users/usersGroups.php b/workflow/engine/methods/users/usersGroups.php index c4b13c737..86ad80716 100755 --- a/workflow/engine/methods/users/usersGroups.php +++ b/workflow/engine/methods/users/usersGroups.php @@ -82,13 +82,16 @@ switch ($_REQUEST['type']) { break; } -$users = Array (); -$users['USR_UID'] = $_GET['uUID']; -$users['USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME']; -$users['USR_LASTNAME'] = $aRow['USR_LASTNAME']; -$users['USR_USERNAME'] = $aRow['USR_USERNAME']; -$users['fullNameFormat'] = $Config['fullNameFormat']; -$users['CURRENT_TAB'] = $ctab; +$arrayAuthSources = $RBAC->getAllAuthSourcesByUser(); + +$users = array(); +$users["USR_UID"] = $_GET["uUID"]; +$users["USR_FIRSTNAME"] = $aRow["USR_FIRSTNAME"]; +$users["USR_LASTNAME"] = $aRow["USR_LASTNAME"]; +$users["USR_USERNAME"] = $aRow["USR_USERNAME"]; +$users["USR_AUTH_SOURCE"] = (isset($arrayAuthSources[$_GET["uUID"]]))? $arrayAuthSources[$_GET["uUID"]] : "ProcessMaker (MYSQL)"; +$users["fullNameFormat"] = $Config["fullNameFormat"]; +$users["CURRENT_TAB"] = $ctab; $oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher->addExtJsScript( 'users/usersGroups', false ); //adding a javascript file .js diff --git a/workflow/engine/templates/users/usersGroups.js b/workflow/engine/templates/users/usersGroups.js index 1839b2bdb..b7eb2c6a9 100755 --- a/workflow/engine/templates/users/usersGroups.js +++ b/workflow/engine/templates/users/usersGroups.js @@ -263,8 +263,8 @@ Ext.onReady(function(){ }); //GROUPS DRAG AND DROP PANEL - GroupsPanel = new Ext.Panel({ - title : _('ID_GROUPS'), + GroupsPanel = new Ext.Panel({ + title: _("ID_GROUPS"), autoWidth : true, layout : 'hbox', defaults : { flex : 1 }, //auto stretch @@ -408,7 +408,15 @@ Ext.onReady(function(){ {columnWidth:.6, padding: 3, layout: 'form', items: [userFields]}, {columnWidth:.4, padding: 3, layout: 'form', items: [userPhoto, caseFields]} ] - }] + }], + buttons: [ + { + text: _("ID_EDIT"), + handler: function () { + location.href = "usersEdit?USR_UID=" + USERS.USR_UID + "&USR_AUTH_SOURCE=" + USERS.USR_AUTH_SOURCE + "&MODE=edit"; + } + } + ] }); SummaryPanel = new Ext.Panel({ From 8c5b886435055eaf15a21f896d7535c73df83e5f Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Fri, 16 Nov 2012 10:18:08 -0400 Subject: [PATCH 3/3] t log BUG 7995 Translation does not work for the import existing proces... SOLVED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Translation does not work for the import existing proces dialogbox - The interface of the Imporación was changed to ExtJS. - Improvement in the form of import, adjustment in the height of the modal window. --- workflow/engine/templates/processes/main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index dc8a97283..1f72c38da 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -841,6 +841,7 @@ importProcessExistProcess = function() header : false, width : 460, height : 210, + autoHeight : true, modal : true, autoScroll : false, maximizable : false, @@ -853,7 +854,7 @@ importProcessExistProcess = function() fileUpload : false, width : 440, frame : true, - autoHeight : false, + autoHeight : true, bodyStyle : 'padding: 10px 10px 0 10px;', labelWidth : 50, defaults : {