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

BUG 8732 "Migrate Logo Setup to ExtJS" SOLVED

Browse Source 
- there wasn't a right redirection for new PMOS UI afeter apply a new logo
- problem fixed, adding a coditional redirection depending of ws
This commit is contained in:
Erik Amaru Ortiz
2012-05-02 12:03:49 -04:00
parent 27eac4dfc2
commit e20d9dbd45
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/controllers/main.php
View File

@@ -48,7 +48,8 @@ class Main extends Controller
if (isset($_SESSION['_defaultUserLocation'])) { if (isset($_SESSION['_defaultUserLocation'])) {
$activeTab = $this->resolveUrlToTabIndex($_SESSION['_defaultUserLocation']); $activeTab = $this->resolveUrlToTabIndex($_SESSION['_defaultUserLocation']);
} }
else if (isset($_GET['st'])) {
if (isset($_GET['st'])) {
$activeTab = $this->getActiveTab($_GET['st']); $activeTab = $this->getActiveTab($_GET['st']);
unset($_GET['st']); unset($_GET['st']);
} }

7
workflow/engine/templates/admin/pmLogo.js
View File

@@ -56,7 +56,12 @@ Ext.onReady(function() {
method : 'post', method : 'post',
params : {nameFunction: 'replacementLogo', NAMELOGO:imageName}, params : {nameFunction: 'replacementLogo', NAMELOGO:imageName},
success : function() { success : function() {
window.parent.window.parent.location.href = window.parent.window.parent.window.location.href if (typeof parent.parent.Ext != 'undefined') {
parent.parent.location.href = '../main?st=admin';
}
else {
window.parent.window.parent.location.href = window.parent.window.parent.window.location.href
}
} }
}); });
} }