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

Merge remote-tracking branch 'upstream/master' into speedy

Browse Source
This commit is contained in:
user
2012-11-16 11:27:46 -04:00
parent 923e375e5a 621c8ebce3
commit 8226caad6b
7 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/model/Users.php
View File

@@ -138,9 +138,9 @@ class Users extends BaseUsers
$aIsoSubdivision = IsoSubdivision::findById( $aFields['USR_COUNTRY'], $aFields['USR_CITY'] ); $aIsoSubdivision = IsoSubdivision::findById( $aFields['USR_COUNTRY'], $aFields['USR_CITY'] );
$aIsoLocation = IsoLocation::findById( $aFields['USR_COUNTRY'], $aFields['USR_CITY'], $aFields['USR_LOCATION'] ); $aIsoLocation = IsoLocation::findById( $aFields['USR_COUNTRY'], $aFields['USR_CITY'], $aFields['USR_LOCATION'] );
$aFields['USR_COUNTRY_NAME'] = $aIsoCountry['IC_NAME']; $aFields["USR_COUNTRY_NAME"] = (!empty($aIsoCountry["IC_NAME"]))? $aIsoCountry["IC_NAME"] : "";
$aFields['USR_CITY_NAME'] = $aIsoSubdivision['IS_NAME']; $aFields["USR_CITY_NAME"] = (!empty($aIsoSubdivision["IS_NAME"]))? $aIsoSubdivision["IS_NAME"] : "";
$aFields['USR_LOCATION_NAME'] = $aIsoLocation['IL_NAME']; $aFields["USR_LOCATION_NAME"] = (!empty($aIsoLocation["IL_NAME"]))? $aIsoLocation["IL_NAME"] : "";
$result = $aFields; $result = $aFields;

2
workflow/engine/methods/events/eventsEdit.php
View File

@@ -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[$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['tasks'] = $aTasks;
$_DBArray['TMP_TRIGGERS'] = $aTriggersList; $_DBArray['TMP_TRIGGERS'] = $aTriggersList;

2
workflow/engine/methods/events/eventsNew.php
View File

@@ -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[$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['tasks'] = $aTasks;
$_DBArray['TMP_TRIGGERS'] = $aTriggersList; $_DBArray['TMP_TRIGGERS'] = $aTriggersList;

4
workflow/engine/methods/users/usersAjax.php
View File

@@ -489,10 +489,6 @@ switch ($_POST['action']) {
$aFields['CASES_MENUSELECTED_NAME'] = $casesMenuSelected; $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->success = true;
$result->user = $aFields; $result->user = $aFields;

17
workflow/engine/methods/users/usersGroups.php
View File

@@ -82,13 +82,16 @@ switch ($_REQUEST['type']) {
break; break;
} }
$users = Array (); $arrayAuthSources = $RBAC->getAllAuthSourcesByUser();
$users['USR_UID'] = $_GET['uUID'];
$users['USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME']; $users = array();
$users['USR_LASTNAME'] = $aRow['USR_LASTNAME']; $users["USR_UID"] = $_GET["uUID"];
$users['USR_USERNAME'] = $aRow['USR_USERNAME']; $users["USR_FIRSTNAME"] = $aRow["USR_FIRSTNAME"];
$users['fullNameFormat'] = $Config['fullNameFormat']; $users["USR_LASTNAME"] = $aRow["USR_LASTNAME"];
$users['CURRENT_TAB'] = $ctab; $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 = & headPublisher::getSingleton();
$oHeadPublisher->addExtJsScript( 'users/usersGroups', false ); //adding a javascript file .js $oHeadPublisher->addExtJsScript( 'users/usersGroups', false ); //adding a javascript file .js

3
workflow/engine/templates/processes/main.js
View File

@@ -841,6 +841,7 @@ importProcessExistProcess = function()
header : false, header : false,
width : 460, width : 460,
height : 210, height : 210,
autoHeight : true,
modal : true, modal : true,
autoScroll : false, autoScroll : false,
maximizable : false, maximizable : false,
@@ -853,7 +854,7 @@ importProcessExistProcess = function()
fileUpload : false, fileUpload : false,
width : 440, width : 440,
frame : true, frame : true,
autoHeight : false, autoHeight : true,
bodyStyle : 'padding: 10px 10px 0 10px;', bodyStyle : 'padding: 10px 10px 0 10px;',
labelWidth : 50, labelWidth : 50,
defaults : { defaults : {

14
workflow/engine/templates/users/usersGroups.js
View File

@@ -263,8 +263,8 @@ Ext.onReady(function(){
}); });
//GROUPS DRAG AND DROP PANEL //GROUPS DRAG AND DROP PANEL
GroupsPanel = new Ext.Panel({ GroupsPanel = new Ext.Panel({
title : _('ID_GROUPS'), title: _("ID_GROUPS"),
autoWidth : true, autoWidth : true,
layout : 'hbox', layout : 'hbox',
defaults : { flex : 1 }, //auto stretch defaults : { flex : 1 }, //auto stretch
@@ -408,7 +408,15 @@ Ext.onReady(function(){
{columnWidth:.6, padding: 3, layout: 'form', items: [userFields]}, {columnWidth:.6, padding: 3, layout: 'form', items: [userFields]},
{columnWidth:.4, padding: 3, layout: 'form', items: [userPhoto, caseFields]} {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({ SummaryPanel = new Ext.Panel({