BUG 8875 "ExtJS based Login & Main ProcessMaker interface" (1st commit)

This commit is contained in:
Erik Amaru Ortiz
2012-03-29 16:42:09 -04:00
parent 0106280056
commit bd2aef2e66
87 changed files with 8549 additions and 270 deletions

View File

@@ -18,11 +18,14 @@ require_once 'classes/model/om/BaseUsersProperties.php';
*/
class UsersProperties extends BaseUsersProperties
{
function UserPropertyExists($sUserUID)
{
var $fields = null;
function UserPropertyExists($sUserUID) {
try {
$oUserProperty = UsersPropertiesPeer::retrieveByPk($sUserUID);
if (is_object($oUserProperty) && get_class($oUserProperty) == 'UsersProperties') {
if (!is_null($oUserProperty) && is_object($oUserProperty) && get_class($oUserProperty) == 'UsersProperties') {
$this->fields = $oUserProperty->toArray(BasePeer::TYPE_FIELDNAME);
$this->fromArray($this->fields, BasePeer::TYPE_FIELDNAME);
return true;
}
else {
@@ -124,7 +127,7 @@ class UsersProperties extends BaseUsersProperties
$this->create($aUserProperty);
}
else {
$aUserProperty = $this->load($sUserUID);
$aUserProperty = $this->fields;
}
return $aUserProperty;
}
@@ -219,6 +222,11 @@ class UsersProperties extends BaseUsersProperties
}
//end plugin
if (substr(SYS_SKIN, 0, 2) === 'ux' && SYS_SKIN != 'uxs') {
return '../main';
}
/**
* New feature - User Experience Redirector
* @author Erik Amaru Ortiz <erik@colosa.com>