diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php index 0d4658561..695dae0f6 100755 --- a/workflow/engine/methods/setup/skin_Ajax.php +++ b/workflow/engine/methods/setup/skin_Ajax.php @@ -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']; diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js index 326632c50..c169f6ac1 100755 --- a/workflow/engine/templates/setup/skinList.js +++ b/workflow/engine/templates/setup/skinList.js @@ -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',