fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #655 from ralpheav/master

Browse Source 
BUG 9849 - When you add a new skin - the skin menu does not show it selected
This commit is contained in:
julceslauhub
2012-10-04 08:56:25 -07:00
parent 1a6ff3e624 a3e05f7cdb
commit 3c1bff361a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/methods/setup/skin_Ajax.php
View File

@@ -46,11 +46,15 @@ function skinList()
G::loadClass('system');
$skinList = System::getSkingList();
$wildcard = '';
if(isset($_REQUEST['activeskin']))
{
$wildcard = '@';
}
foreach ($skinList['skins'] as $key => $value) {
if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs') {
if($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']){
$wildcard = '@';
$value['SKIN_STATUS'] = $wildcard . G::LoadTranslation('ID_ACTIVE');
$value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME'];
$value['SKIN_DESCRIPTION'] = $wildcard . $value['SKIN_DESCRIPTION'];

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

@@ -165,7 +165,7 @@ Ext.onReady(function(){
store = new Ext.data.GroupingStore( {
proxy : new Ext.data.HttpProxy({
url: 'skin_Ajax?action=skinList'
url: 'skin_Ajax?action=skinList&activeskin=1'
}),
reader : new Ext.data.JsonReader( {
root: 'skins',