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

Merge pull request #1099 from marcoAntonioNina/BUG-10083

Browse Source 
BUG 10083 skins not being remembered after logout IMPROVEMENT
This commit is contained in:
julceslauhub
2012-12-14 09:35:41 -08:00
parent 7fe3e82c3a a157292688
commit ae4fb31012
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gulliver/system/class.bootstrap.php
View File

@@ -446,11 +446,7 @@ class Bootstrap
}
define ( "SYS_LANG", $args ['SYS_LANG'] );
if (isset($_COOKIE['workspaceSkin'])) {
define('SYS_SKIN', $_COOKIE['workspaceSkin']);
} else {
define('SYS_SKIN', $args ['SYS_SKIN']);
}
define('SYS_SKIN', $args ['SYS_SKIN']);
define ( 'SYS_COLLECTION', $args ['SYS_COLLECTION'] );
define ( 'SYS_TARGET', $args ['SYS_TARGET'] );

24
workflow/engine/classes/model/UsersProperties.php
View File

@@ -251,7 +251,16 @@ class UsersProperties extends BaseUsersProperties
$url = '';
if (substr( SYS_SKIN, 0, 2 ) == 'ux' && SYS_SKIN != 'uxs') {
$url = '/sys' . SYS_SYS . '/' . $this->lang . '/' . SYS_SKIN . '/main';
if (isset($_COOKIE['workspaceSkin'])) {
if (substr( $_COOKIE['workspaceSkin'], 0, 2 ) != 'ux') {
$url = $this->_getDefaultLocation();
return $url;
} else {
$url = '/sys' . SYS_SYS . '/' . $this->lang . '/' . $_COOKIE['workspaceSkin'] . '/main';
}
} else {
$url = '/sys' . SYS_SYS . '/' . $this->lang . '/' . SYS_SKIN . '/main';
}
global $RBAC;
G::loadClass( 'configuration' );
$oConf = new Configurations();
@@ -317,7 +326,11 @@ class UsersProperties extends BaseUsersProperties
if (isset( $aRedirectLogin ) && is_array( $aRedirectLogin )) {
foreach ($aRedirectLogin as $key => $detail) {
if (isset( $detail->sPathMethod ) && $detail->sRoleCode == $userRole) {
$url = '/sys' . SYS_SYS . '/' . $this->lang . '/' . SYS_SKIN . '/' . $detail->sPathMethod;
if (isset($_COOKIE['workspaceSkin'])) {
$url = '/sys' . SYS_SYS . '/' . $this->lang . '/' . $_COOKIE['workspaceSkin'] . '/' . $detail->sPathMethod;
} else {
$url = '/sys' . SYS_SYS . '/' . $this->lang . '/' . SYS_SKIN . '/' . $detail->sPathMethod;
}
}
}
}
@@ -378,7 +391,12 @@ class UsersProperties extends BaseUsersProperties
$oConf = new Configurations();
$oConf->loadConfig( $x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '' );
$baseUrl = '/sys' . SYS_SYS . '/' . $this->lang . '/' . SYS_SKIN . '/';
//$baseUrl = '/sys' . SYS_SYS . '/' . $this->lang . '/' . SYS_SKIN . '/';
if (isset($_COOKIE['workspaceSkin'])) {
$baseUrl = '/sys' . SYS_SYS . '/' . $this->lang . '/' . $_COOKIE['workspaceSkin'] . '/';
} else {
$baseUrl = '/sys' . SYS_SYS . '/' . $this->lang . '/' . SYS_SKIN . '/';
}
$url = '';
if (sizeof( $oConf->aConfig ) > 0) {

8
workflow/engine/controllers/home.php
View File

@@ -98,9 +98,11 @@ class Home extends Controller
$processList = $case->getStartCasesPerType( $_SESSION['USER_LOGGED'], 'category' );
$switchLink = $userProperty->getUserLocation( $_SESSION['USER_LOGGED'] );
if (substr( $sysConf['default_skin'], 0, 2 ) == 'ux') {
$_SESSION['_defaultUserLocation'] = $switchLink;
$switchLink = '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . $sysConf['default_skin'] . '/main';
if (!isset($_COOKIE['workspaceSkin'])) {
if (substr( $sysConf['default_skin'], 0, 2 ) == 'ux') {
$_SESSION['_defaultUserLocation'] = $switchLink;
$switchLink = '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . $sysConf['default_skin'] . '/main';
}
}
unset( $processList[0] );