From: Edward <edward@roojs.com>
Date: Mon, 4 May 2015 08:12:09 +0000 (+0800)
Subject: Pman.Dialog.CoreNotifyRecur.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=edb8aa021dfa2ad7e2ccbb519a08879907d7d2fc

Pman.Dialog.CoreNotifyRecur.bjs
Pman.Dialog.CoreNotifyRecur.js
---

diff --git a/Pman.Dialog.CoreNotifyRecur.bjs b/Pman.Dialog.CoreNotifyRecur.bjs
index e86a3b90..d866a163 100644
--- a/Pman.Dialog.CoreNotifyRecur.bjs
+++ b/Pman.Dialog.CoreNotifyRecur.bjs
@@ -63,7 +63,7 @@
         "|render" : "function() \n{\n    _this.grid = this; \n    //_this.dialog = Pman.Dialog.FILL_IN\n    if (_this.panel.active) {\n    //   this.footer.onClick('first');\n    }\n}",
         "afteredit" : "function (e)\n{\n   e.record.commit();\n}"
        },
-       "autoExpandColumn" : "freq_day",
+       "autoExpandColumn" : "keyword_filters",
        "xtype" : "EditorGrid",
        "loadMask" : true,
        "clicksToEdit" : 1,
@@ -250,7 +250,7 @@
         {
          "xtype" : "ColumnModel",
          "header" : "on day(s)",
-         "width" : 100,
+         "width" : 150,
          "$ renderer" : "function(v,x,r) { \n    \n    if (v.length) {\n     \n        var cm = _this.grid.colModel;\n       \n        var ci = cm.getColumnByDataIndex(this.name);\n       \n         var tv = [];\n        var vals = Roo.decode(v);\n        Roo.each(vals, function(k) {\n            var r = this.findRecord(this.valueField, k);\n            if(r){\n                tv.push(r.data[this.displayField]);\n            }else if(this.valueNotFoundText !== undefined){\n                tv.push( this.valueNotFoundText );\n            }\n        },ci.editor.field);\n\n        r.data[this.name + '_name'] = tv.join(', ');\n        return String.format('{0}',tv.join(', '));\n\n        \n    \n    }\n    r.data[this.name + '_name'] = '';\n    return String.format('{0}', r.data.freq_day_name || v); \n    \n}",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",
diff --git a/Pman.Dialog.CoreNotifyRecur.js b/Pman.Dialog.CoreNotifyRecur.js
index a1a3d318..0908ebc7 100644
--- a/Pman.Dialog.CoreNotifyRecur.js
+++ b/Pman.Dialog.CoreNotifyRecur.js
@@ -293,7 +293,7 @@ Pman.Dialog.CoreNotifyRecur = {
 
        },
        '|xns' : 'Roo.grid',
-       autoExpandColumn : 'freq_day',
+       autoExpandColumn : 'keyword_filters',
        clicksToEdit : 1,
        loadMask : true,
        xns : Roo.grid,
@@ -514,7 +514,7 @@ Pman.Dialog.CoreNotifyRecur = {
               return String.format('{0}', r.data.freq_day_name || v); 
               
           },
-          width : 100,
+          width : 150,
           xns : Roo.grid,
           xtype : 'ColumnModel',
           items : [