From: Alan Knowles <alan@akbkhome.com>
Date: Wed, 16 May 2012 10:23:14 +0000 (+0800)
Subject: Pman.Dialog.CoreNotifyRecur.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=fa377bea306c99d5cd8f87c68989d843c1b8d5a0

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

diff --git a/Pman.Dialog.CoreNotifyRecur.bjs b/Pman.Dialog.CoreNotifyRecur.bjs
index f3336751..2b07b71b 100644
--- a/Pman.Dialog.CoreNotifyRecur.bjs
+++ b/Pman.Dialog.CoreNotifyRecur.bjs
@@ -162,7 +162,7 @@
                                     "header": "on day(s)",
                                     "width": 100,
                                     "xtype": "ColumnModel",
-                                    "|renderer": "function(v,x,r) { \n    \n    return String.format('{0}', r.data.freq_day_name || v); \n    \n}",
+                                    "|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        \n        return String.format('{0}',tv.join(', '));\n\n        \n    \n    }\n    return String.format('{0}', r.data.freq_day_name || v); \n    \n}",
                                     "|xns": "Roo.grid",
                                     "items": [
                                         {
diff --git a/Pman.Dialog.CoreNotifyRecur.js b/Pman.Dialog.CoreNotifyRecur.js
index 597aadfa..6763adb9 100644
--- a/Pman.Dialog.CoreNotifyRecur.js
+++ b/Pman.Dialog.CoreNotifyRecur.js
@@ -289,6 +289,29 @@ Pman.Dialog.CoreNotifyRecur = {
                                 width : 100,
                                 renderer : function(v,x,r) { 
                                     
+                                    if (v.length) {
+                                     
+                                        var cm = _this.grid.colModel;
+                                       
+                                        var ci = cm.getColumnByDataIndex(this.name);
+                                       
+                                         var tv = [];
+                                        var vals = Roo.decode(v);
+                                        Roo.each(vals, function(k) {
+                                            var r = this.findRecord(this.valueField, k);
+                                            if(r){
+                                                tv.push(r.data[this.displayField]);
+                                            }else if(this.valueNotFoundText !== undefined){
+                                                tv.push( this.valueNotFoundText );
+                                            }
+                                        },ci.editor.field);
+                                
+                                        
+                                        return String.format('{0}',tv.join(', '));
+                                
+                                        
+                                    
+                                    }
                                     return String.format('{0}', r.data.freq_day_name || v); 
                                     
                                 },