fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 6477 Fix bug, fields in the User Summary.

Browse Source
This commit is contained in:
Hector Cortez
2011-05-12 17:25:30 -04:00
parent 587a0f67be
commit db243f80bf
6 changed files with 95 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/classes/model/IsoLocation.php
View File

@@ -40,6 +40,34 @@ require_once 'classes/model/om/BaseIsoLocation.php';
*/
class IsoLocation extends BaseIsoLocation {
function findById($IC_UID, $IS_UID, $IL_UID){
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(IsoLocationPeer::IC_UID);
$oCriteria->addSelectColumn(IsoLocationPeer::IS_UID);
$oCriteria->addSelectColumn(IsoLocationPeer::IL_UID);
$oCriteria->addSelectColumn(IsoLocationPeer::IL_NAME);
$oCriteria->add(IsoLocationPeer::IC_UID, $IC_UID);
$oCriteria->add(IsoLocationPeer::IS_UID, $IS_UID);
$oCriteria->add(IsoLocationPeer::IL_UID, $IL_UID);
$oDataset = IsoLocationPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
return $oDataset->getRow();
}
function findByIcName($IL_NAME){
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(IsoLocationPeer::IC_UID);
$oCriteria->addSelectColumn(IsoLocationPeer::IS_UID);
$oCriteria->addSelectColumn(IsoLocationPeer::IL_UID);
$oCriteria->addSelectColumn(IsoLocationPeer::IL_NAME);
$oCriteria->add(IsoLocationPeer::IL_NAME, $IL_NAME);
$oDataset = IsoLocationPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
return $oDataset->getRow();
}
function getAllRowsLike($word)
{
try {

23
workflow/engine/classes/model/IsoSubdivision.php
View File

@@ -39,5 +39,28 @@ require_once 'classes/model/om/BaseIsoSubdivision.php';
* @package workflow.engine.classes.model
*/
class IsoSubdivision extends BaseIsoSubdivision {
function findById($IC_UID, $IS_UID){
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(IsoSubdivisionPeer::IC_UID);
$oCriteria->addSelectColumn(IsoSubdivisionPeer::IS_UID);
$oCriteria->addSelectColumn(IsoSubdivisionPeer::IS_NAME);
$oCriteria->add(IsoSubdivisionPeer::IC_UID, $IC_UID);
$oCriteria->add(IsoSubdivisionPeer::IS_UID, $IS_UID);
$oDataset = IsoSubdivisionPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
return $oDataset->getRow();
}
function findByIcName($IS_NAME){
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(IsoSubdivisionPeer::IC_UID);
$oCriteria->addSelectColumn(IsoSubdivisionPeer::IS_UID);
$oCriteria->addSelectColumn(IsoSubdivisionPeer::IS_NAME);
$oCriteria->add(IsoSubdivisionPeer::IS_NAME, $IS_UID);
$oDataset = IsoSubdivisionPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
return $oDataset->getRow();
}
} // IsoSubdivision

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

@@ -25,7 +25,9 @@
*/
require_once 'classes/model/om/BaseUsers.php';
require_once 'classes/model/IsoCountry.php';
require_once 'classes/model/IsoSubdivision.php';
require_once 'classes/model/IsoLocation.php';
/**
* Skeleton subclass for representing a row from the 'USERS' table.
@@ -132,6 +134,39 @@ public function userExists($UsrUid)
}
}
public function loadDetailed($UsrUid)
{
try {
$result = array();
$oUser = UsersPeer::retrieveByPK( $UsrUid );
if (!is_null($oUser)) {
$aFields = $oUser->toArray(BasePeer::TYPE_FIELDNAME);
$this->fromArray($aFields,BasePeer::TYPE_FIELDNAME);
$this->setNew(false);
$aIsoCountry = IsoCountry::findById($aFields['USR_COUNTRY']);
$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'];
$result = $aFields;
return $result;
}
else {
// return $result;
throw(new Exception( "The row '" . $UsrUid . "' in table USER doesn't exist!" ));
}
}
catch (Exception $oError) {
throw($oError);
}
}
public function update($fields)
{
$con = Propel::getConnection(UsersPeer::DATABASE_NAME);

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

@@ -56,7 +56,7 @@ $G_PUBLISH = new Publisher;
G::LoadClass('configuration');
$c = new Configurations();
$configEnv = $c->getConfiguration('ENVIRONMENT_SETTINGS', '');
$Config['fullNameFormat'] = isset($configEnv['format']) ? $configEnv['format'] : '@userName';
$Config['fullNameFormat'] = isset($configEnv['format']) ? $configEnv['format'] : '@firstName @lastName (@userName)';
require_once 'classes/model/Users.php';
$oCriteria = new Criteria();

3
workflow/engine/methods/users/users_Ajax.php
View File

@@ -425,7 +425,8 @@ try {
require_once 'classes/model/AppCacheView.php';
G::LoadClass('configuration');
$oUser = new Users();
$data = $oUser->load($_REQUEST['USR_UID']);
// $data = $oUser->load($_REQUEST['USR_UID']);
$data = $oUser->loadDetailed($_REQUEST['USR_UID']);
$oAppCache = new AppCacheView();
$aTypes = Array();
$aTypes['to_do'] = 'CASES_INBOX';

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

@@ -730,9 +730,9 @@ LoadSummary = function(){
Ext.getCmp('lname').setText(user.userdata.USR_LASTNAME);
Ext.getCmp('uname').setText(user.userdata.USR_USERNAME);
Ext.getCmp('email').setText(user.userdata.USR_EMAIL);
Ext.getCmp('country').setText(user.userdata.USR_COUNTRY);
Ext.getCmp('state').setText(user.userdata.USR_CITY);
Ext.getCmp('location').setText(user.userdata.USR_LOCATION);
Ext.getCmp('country').setText(user.userdata.USR_COUNTRY_NAME);
Ext.getCmp('state').setText(user.userdata.USR_CITY_NAME);
Ext.getCmp('location').setText(user.userdata.USR_LOCATION_NAME);
Ext.getCmp('role').setText(user.userdata.USR_ROLE);
Ext.getCmp('address').setText(user.userdata.USR_ADDRESS);
Ext.getCmp('phone').setText(user.userdata.USR_PHONE);
@@ -741,6 +741,7 @@ LoadSummary = function(){
Ext.getCmp('status').setText(user.userdata.USR_STATUS);
Ext.getCmp('replaced').setText(user.misc.REPLACED_NAME);
Ext.getCmp('department').setText(user.misc.DEP_TITLE);
Ext.getCmp('position').setText(user.userdata.USR_POSITION);
Ext.getCmp('inbox').setText(user.cases.to_do);
Ext.getCmp('draft').setText(user.cases.draft);