From: edward <edward@roojs.com>
Date: Mon, 18 Jul 2016 07:33:36 +0000 (+0800)
Subject: Pman.Tab.AdminEmailTemplates.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=commitdiff_plain;h=f4df70fe19a7d655b703d8e882c518dc979f83bd

Pman.Tab.AdminEmailTemplates.bjs
Pman.Tab.AdminEmailTemplates.js
---

diff --git a/Pman.Tab.AdminEmailTemplates.bjs b/Pman.Tab.AdminEmailTemplates.bjs
index e0df65e..2ff466a 100644
--- a/Pman.Tab.AdminEmailTemplates.bjs
+++ b/Pman.Tab.AdminEmailTemplates.bjs
@@ -199,24 +199,14 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 250,
            "header" : "Name",
+           "width" : 250,
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "Boolean sortable" : true,
-           "* prop" : "colModel[]",
+           "* prop" : "cm[]",
            "dataIndex" : "name"
           },
-          {
-           "xtype" : "ColumnModel",
-           "width" : 300,
-           "header" : "Title",
-           "$ renderer" : "function(v) { return String.format('{0}', v); }",
-           "$ xns" : "Roo.grid",
-           "Boolean sortable" : true,
-           "* prop" : "colModel[]",
-           "dataIndex" : "subject"
-          },
           {
            "xtype" : "ColumnModel",
            "header" : "Title",
@@ -229,22 +219,34 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 400,
            "header" : "From Name",
+           "width" : 400,
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "Boolean sortable" : true,
-           "* prop" : "colModel[]",
-           "dataIndex" : "from_name"
+           "* prop" : "cm[]",
+           "dataIndex" : "from_name",
+           "items" : [
+            {
+             "xtype" : "ColumnModel",
+             "width" : 300,
+             "header" : "Title",
+             "$ renderer" : "function(v) { return String.format('{0}', v); }",
+             "$ xns" : "Roo.grid",
+             "Boolean sortable" : true,
+             "* prop" : "cm[]",
+             "dataIndex" : "subject"
+            }
+           ]
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 400,
            "header" : "From Email",
+           "width" : 400,
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "Boolean sortable" : true,
-           "* prop" : "colModel[]",
+           "* prop" : "cm[]",
            "dataIndex" : "from_email"
           }
          ]
diff --git a/Pman.Tab.AdminEmailTemplates.js b/Pman.Tab.AdminEmailTemplates.js
index 5be6af0..5a3efd4 100644
--- a/Pman.Tab.AdminEmailTemplates.js
+++ b/Pman.Tab.AdminEmailTemplates.js
@@ -316,7 +316,7 @@ Pman.Tab.AdminEmailTemplates = new Roo.XComponent({
         '|xns' : 'Roo.grid',
         xtype : 'RowSelectionModel'
        },
-       colModel : [
+       cm : [
         {
          dataIndex : 'name',
          header : _this._strings['49ee3087348e8d44e1feda1917443987'] /* Name */,
@@ -345,7 +345,19 @@ Pman.Tab.AdminEmailTemplates = new Roo.XComponent({
          width : 400,
          xns : Roo.grid,
          '|xns' : 'Roo.grid',
-         xtype : 'ColumnModel'
+         xtype : 'ColumnModel',
+         cm : [
+          {
+           dataIndex : 'subject',
+           header : _this._strings['b78a3223503896721cca1303f776159b'] /* Title */,
+           renderer : function(v) { return String.format('{0}', v); },
+           sortable : true,
+           width : 300,
+           xns : Roo.grid,
+           '|xns' : 'Roo.grid',
+           xtype : 'ColumnModel'
+          }
+         ]
         },
         {
          dataIndex : 'from_email',
@@ -357,18 +369,6 @@ Pman.Tab.AdminEmailTemplates = new Roo.XComponent({
          '|xns' : 'Roo.grid',
          xtype : 'ColumnModel'
         }
-       ],
-       cm : [
-        {
-         dataIndex : 'subject',
-         header : _this._strings['b78a3223503896721cca1303f776159b'] /* Title */,
-         renderer : function(v) { return String.format('{0}', v); },
-         sortable : true,
-         width : 300,
-         xns : Roo.grid,
-         '|xns' : 'Roo.grid',
-         xtype : 'ColumnModel'
-        }
        ]
       }
      },