DataObjects/Core_notify_recur.php

[Pman.Core] / Pman.Dialog.CoreNotifyRecur.js

diff --git a/Pman.Dialog.CoreNotifyRecur.js b/Pman.Dialog.CoreNotifyRecur.js
index 683a7f5..0908ebc 100644 (file)
--- a/Pman.Dialog.CoreNotifyRecur.js
+++ b/Pman.Dialog.CoreNotifyRecur.js
@@ -60,7 +60,7 @@ Pman.Dialog.CoreNotifyRecur = {
     '|xns' : 'Roo',
     height : 550,
     modal : true,
-    resizable : false,
+    resizable : true,
     title : _this._strings['c1d32776cd2d2afcd2c45a52f58679f4'],
     width : 800,
     xns : Roo,
@@ -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 : [
@@ -705,9 +705,11 @@ Pman.Dialog.CoreNotifyRecur = {
          },
 {
           '|xns' : 'Roo.grid',
-          dataIndex : 'last_event_id',
+          dataIndex : 'keyword_filters',
           header : _this._strings['867343577fa1f33caa632a19543bd252'],
-          renderer : function(v) { return String.format('{0}', v ? v : ''); },
+          renderer : function(v,x,r) { 
+              return String.format('{0}', v ? r.data.keywords : ''); 
+          },
           width : 75,
           xns : Roo.grid,
           xtype : 'ColumnModel'
@@ -718,6 +720,24 @@ Pman.Dialog.CoreNotifyRecur = {
          {
             e.record.commit();
          },
+        cellclick : function (_self, rowIndex, columnIndex, e)
+         {
+             var di = this.colModel.getDataIndex(columnIndex);
+             if (di != 'keyword_filters') {
+                 return;
+             }
+             
+             var d = this.ds.getAt(rowIndex);
+             
+             if(!d || d.data.id * 1 < 1){
+                 return;
+             }
+             
+             Pman.Dialog.CoreNotifyRecurKeywords.show({id : d.data.id}, function(res){
+                 _this.grid.ds.load({});
+             });
+             
+         },
         render : function() 
          {
              _this.grid = this; 
@@ -725,13 +745,6 @@ Pman.Dialog.CoreNotifyRecur = {
              if (_this.panel.active) {
              //   this.footer.onClick('first');
              }
-         },
-        rowdblclick : function (_self, rowIndex, e)
-         {
-             if (!_this.dialog) return;
-             _this.dialog.show( this.getDataSource().getAt(rowIndex).data, function() {
-                 _this.grid.footer.onClick('first');
-             }); 
          }
        },
        items : [