From 8cf119545f8733208e4ab12261307bbcc1f5bf53 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Thu, 24 Sep 2020 12:39:23 +0800
Subject: [PATCH] tidy up listing of email templates

---
 Pman.Tab.AdminEmailTemplates.bjs | 10 +++++-----
 Pman.Tab.AdminEmailTemplates.js  | 13 +++++++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Pman.Tab.AdminEmailTemplates.bjs b/Pman.Tab.AdminEmailTemplates.bjs
index 0be3b8f..38c167e 100644
--- a/Pman.Tab.AdminEmailTemplates.bjs
+++ b/Pman.Tab.AdminEmailTemplates.bjs
@@ -89,7 +89,7 @@
            },
            "xtype" : "Store",
            "remoteSort" : true,
-           "$ sortInfo" : "{ field : 'name', direction: 'ASC' }",
+           "$ sortInfo" : "{ field : 'description', direction: 'ASC' }",
            "$ xns" : "Roo.data",
            "* prop" : "dataSource",
            "items" : [
@@ -205,7 +205,7 @@
            "xtype" : "ColumnModel",
            "header" : "Name",
            "width" : 250,
-           "$ renderer" : "function(v,x,r) \n{ \n    if(r.data.active * 1 < 1){\n        return String.format('<s>{0}</s>', v ? v : ''); \n    }\n    \n    return String.format('{0}', v ? v : ''); \n}",
+           "$ renderer" : "function(v,x,r) \n{ \n    if (r.data.description.length > 0) {\n        v = r.data.description;\n    }\n    \n    \n    if(r.data.active * 1 < 1){\n        return String.format('<s>{0}</s>', v ? v : ''); \n    }\n    \n    return String.format('{0}', v ? v : ''); \n}",
            "$ xns" : "Roo.grid",
            "Boolean sortable" : true,
            "* prop" : "cm[]",
@@ -224,7 +224,7 @@
           {
            "xtype" : "ColumnModel",
            "header" : "From Name",
-           "width" : 300,
+           "width" : 150,
            "$ renderer" : "function(v) { return String.format('{0}', v ? v : ''); }",
            "$ xns" : "Roo.grid",
            "Boolean sortable" : true,
@@ -233,7 +233,7 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 300,
+           "width" : 150,
            "header" : "From Email",
            "$ renderer" : "function(v) { return String.format('{0}', v ? v : ''); }",
            "$ xns" : "Roo.grid",
@@ -244,7 +244,7 @@
           {
            "xtype" : "ColumnModel",
            "header" : "BCC Group",
-           "width" : 300,
+           "width" : 150,
            "$ renderer" : "function(v) { return String.format('{0}', v ? v : ''); }",
            "$ xns" : "Roo.grid",
            "Boolean sortable" : true,
diff --git a/Pman.Tab.AdminEmailTemplates.js b/Pman.Tab.AdminEmailTemplates.js
index 335de41..013f396 100644
--- a/Pman.Tab.AdminEmailTemplates.js
+++ b/Pman.Tab.AdminEmailTemplates.js
@@ -275,7 +275,7 @@ Pman.Tab.AdminEmailTemplates = new Roo.XComponent({
        dataSource : {
         xtype : 'Store',
         remoteSort : true,
-        sortInfo : { field : 'name', direction: 'ASC' },
+        sortInfo : { field : 'description', direction: 'ASC' },
         listeners : {
          beforeload : function (_self, options)
           {
@@ -330,6 +330,11 @@ Pman.Tab.AdminEmailTemplates = new Roo.XComponent({
          header : _this._strings['49ee3087348e8d44e1feda1917443987'] /* Name */,
          renderer : function(v,x,r) 
          { 
+             if (r.data.description.length > 0) {
+                 v = r.data.description;
+             }
+             
+             
              if(r.data.active * 1 < 1){
                  return String.format('<s>{0}</s>', v ? v : ''); 
              }
@@ -364,7 +369,7 @@ Pman.Tab.AdminEmailTemplates = new Roo.XComponent({
          header : _this._strings['4a4a8fe0c6dfb6bd2a41755d15eb6f0b'] /* From Name */,
          renderer : function(v) { return String.format('{0}', v ? v : ''); },
          sortable : true,
-         width : 300,
+         width : 150,
          xns : Roo.grid,
          '|xns' : 'Roo.grid'
         },
@@ -374,7 +379,7 @@ Pman.Tab.AdminEmailTemplates = new Roo.XComponent({
          header : _this._strings['4ca679a383343ab3d4ca1cd7c91b43f7'] /* From Email */,
          renderer : function(v) { return String.format('{0}', v ? v : ''); },
          sortable : true,
-         width : 300,
+         width : 150,
          xns : Roo.grid,
          '|xns' : 'Roo.grid'
         },
@@ -384,7 +389,7 @@ Pman.Tab.AdminEmailTemplates = new Roo.XComponent({
          header : _this._strings['68b00d723d37122f64da8d9939f836f0'] /* BCC Group */,
          renderer : function(v) { return String.format('{0}', v ? v : ''); },
          sortable : true,
-         width : 300,
+         width : 150,
          xns : Roo.grid,
          '|xns' : 'Roo.grid'
         }
-- 
2.39.2