fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 10595 Can't change skins in 2.0.46 SOLVED

Browse Source 
- redirect incorrect with top.location to change skin.
- change top -> parent.
This commit is contained in:
Marco Antonio Nina
2013-01-31 16:32:57 -04:00
parent 5ace4df394
commit 3ed3064b72
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/templates/admin/pmLogo.html
View File

@@ -90,7 +90,7 @@
#images-view .x-view-selected { #images-view .x-view-selected {
border : 1px solid #99bbe8; border : 1px solid #99bbe8;
background : #eff5fb url(/images/selected.gif) no-repeat right bottom; background : #eff5fb url(/images/select-icon.png) no-repeat right bottom;
opacity : 0.5; opacity : 0.5;
padding : 5px; padding : 5px;
} }

7
workflow/engine/templates/setup/skinList.js
View File

@@ -801,7 +801,7 @@ function changeSkin(newSkin,currentSkin){
success: function(r, o){ success: function(r, o){
var response = Ext.util.JSON.decode(r.responseText); var response = Ext.util.JSON.decode(r.responseText);
if (response.success) { if (response.success) {
currentLocation = top.location.href; currentLocation = parent.parent.location.href;
createCookie ('workspaceSkin', newSkin, '1'); createCookie ('workspaceSkin', newSkin, '1');
if (currentSkin.substring(0,2) != 'ux') { if (currentSkin.substring(0,2) != 'ux') {
if (newSkin.substring(0,2) == 'ux') { if (newSkin.substring(0,2) == 'ux') {
@@ -820,9 +820,8 @@ function changeSkin(newSkin,currentSkin){
if (point == -1) { if (point == -1) {
newLocation = newLocation +"?s=SKINS"; newLocation = newLocation +"?s=SKINS";
} }
top.location.href = newLocation; parent.parent.location = newLocation;
} } else {
else {
viewport.getEl().unmask(); viewport.getEl().unmask();
PMExt.error(_('ID_SKINS'), response.message); PMExt.error(_('ID_SKINS'), response.message);
} }