Merge pull request #653 from ralpheav/master

BUG 9849 - When you add a new skin - the skin menu does not show it selected

workflow/engine/methods/setup/skin_Ajax.php

@@ -49,6 +49,18 @@ function skinList()
 
     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'];
+                $value['SKIN_AUTHOR'] = $wildcard . $value['SKIN_AUTHOR'];
+                $value['SKIN_CREATEDATE'] = $wildcard . $value['SKIN_CREATEDATE'];
+                $value['SKIN_MODIFIEDDATE'] = $wildcard . $value['SKIN_MODIFIEDDATE'];
+            }
+            else{
+                $value['SKIN_STATUS'] = G::LoadTranslation('ID_INACTIVE');
+            }
             $skinListArray['skins'][] = $value;
         }
     }

workflow/engine/templates/setup/skinList.js

@@ -223,21 +223,24 @@ Ext.onReady(function(){
       header: _('ID_NAME'),
       dataIndex: 'SKIN_NAME',
       width: 80,
-      align:'left'
+      align:'left',
+      renderer: selectedSkinChecked
     },
 
     {
       header: _('ID_DESCRIPTION'),
       dataIndex: 'SKIN_DESCRIPTION',
       width: 200,
-      align:'left'
+      align:'left',
+      renderer: selectedSkin
     },
 
     {
       header: _('ID_AUTHOR'),
       dataIndex: 'SKIN_AUTHOR',
       width: 80,
-      align:'left'
+      align:'left',
+      renderer: selectedSkin
     },
 
     {
@@ -254,6 +257,14 @@ Ext.onReady(function(){
       width: 50,
       align:'center',
       renderer: showdate
+    },
+    
+    {
+      header: _('ID_STATUS'),
+      dataIndex: 'SKIN_STATUS',
+      width: 50,
+      align:'center',
+      renderer: selectedSkin
     }
 
     ]
@@ -357,12 +368,43 @@ Ext.onReady(function(){
   });
 });
 
+gotWildCard = function (value){
+    var currentSkinWildcard = '@';
+    if(value.length <= 0){
+        return false;
+    }
+    return (value[0] == currentSkinWildcard);
+}
+
+setBoldItalic = function(value)
+{
+    return '<b><i>' + value + '</i></b>';
+}
 
 //Function format dates
 showdate = function (value){
-  return _DF(value);
+    if(gotWildCard(value)){
+        return setBoldItalic(_DF(value.substring(1)));
+    }
+    return _DF(value);
 };
 
+selectedSkin = function (value){
+    if(gotWildCard(value)){
+        return setBoldItalic(value.substring(1));
+    }
+    return value;
+};
+
+selectedSkinChecked = function (value){
+    if(value[0]=='@'){
+        str = value.substring(1);
+        return '<b><i><img src="/images/checkedsmall.gif">' + str + '</i></b>';
+    }
+    return value;
+};
+
+
 //Funtion Handles Context Menu Opening
 onMessageContextMenu = function (grid, rowIndex, e) {
   e.stopEvent();