X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Pman.Dialog.CoreNotifyRecurKeywords.js;h=bddf1de2589a80485fd5f012706714068efc8da7;hb=61229b70e50bf98a966c52d17bcd81af76369208;hp=0be720a0e08d085823cdffa796b9ab2027cf928a;hpb=cfc0b34b2445c3b9b090a42cd0840cc875460a20;p=Pman.Core

diff --git a/Pman.Dialog.CoreNotifyRecurKeywords.js b/Pman.Dialog.CoreNotifyRecurKeywords.js
index 0be720a0..bddf1de2 100644
--- a/Pman.Dialog.CoreNotifyRecurKeywords.js
+++ b/Pman.Dialog.CoreNotifyRecurKeywords.js
@@ -49,11 +49,11 @@ Pman.Dialog.CoreNotifyRecurKeywords = {
     background : true,
     closable : false,
     collapsible : false,
-    height : 150,
+    height : 180,
     modal : true,
     resizable : false,
     title : _this._strings['790f855c2139f2faecb810519e90b833'],
-    width : 400,
+    width : 600,
     xns : Roo,
     xtype : 'LayoutDialog',
     buttons : [
@@ -76,17 +76,8 @@ Pman.Dialog.CoreNotifyRecurKeywords = {
        xtype : 'Button',
        listeners : {
         click : function() {
-             /*
-             var name =     _this.form.findField('name').getValue();
-             name = name.toUpperCase().replace(/[^A-Z]+/g, '');
-             if (!name.length) {
-                 Roo.MessageBox.alert("Error","Please fill in a valid name");
-                 return;
-             }
-             _this.form.findField('name').setValue(name);
-          
+             
              _this.form.doAction('submit');
-             */
              
          }
        }
@@ -127,7 +118,16 @@ Pman.Dialog.CoreNotifyRecurKeywords = {
                   return;
               }
               if (action.type == 'load') {
+                  
                   _this.dialog.el.unmask();
+                  
+                  _this.data = action.result.data;
+                  
+                  if(typeof(_this.data.keywords) != 'undefined'){
+                      var n = Roo.decode(_this.data.keywords);
+                      _this.form.findField('keyword_filters').setValue(n);
+                  }
+                  
                   return;
               }
               if (action.type == 'submit' ) {
@@ -192,7 +192,7 @@ Pman.Dialog.CoreNotifyRecurKeywords = {
           listWidth : 400,
           loadingText : _this._strings['1243daf593fa297e07ab03bf06d925af'],
           minChars : 2,
-          name : 'camapign_id_name',
+          name : 'campaign_id_name',
           pageSize : 20,
           qtip : _this._strings['0ee0f676f631ad4e8a5844314a3a20de'],
           queryParam : 'query[name]',
@@ -201,7 +201,7 @@ Pman.Dialog.CoreNotifyRecurKeywords = {
           triggerAction : 'all',
           typeAhead : false,
           valueField : 'id',
-          width : 200,
+          width : 400,
           xns : Roo.form,
           xtype : 'ComboBox',
           items : [
@@ -258,16 +258,15 @@ Pman.Dialog.CoreNotifyRecurKeywords = {
            alwaysQuery : true,
            displayField : 'keyword',
            editable : true,
-           fieldLabel : 'company',
+           fieldLabel : 'Keyword',
            forceSelection : true,
-           idField : 'id',
-           listWidth : 200,
+           listWidth : 400,
            minChars : 2,
-           queryParam : 'search[display_name]',
+           queryParam : 'query[keyword]',
            tpl : '<div class=\"x-grid-cell-text x-btn button\"><b>{keyword}</b> </div>',
            triggerAction : 'all',
            valueField : 'id',
-           width : 200,
+           width : 400,
            xns : Roo.form,
            xtype : 'ComboBox',
            items : [
@@ -276,10 +275,11 @@ Pman.Dialog.CoreNotifyRecurKeywords = {
 
           },
           '|xns' : 'Roo.form',
-          fieldLabel : 'Company Types',
-          hiddenName : 'filter_company_type',
-          name : 'filter_company_type_name',
-          width : 210,
+          allowBlank : false,
+          fieldLabel : 'Keywords',
+          hiddenName : 'keyword_filters',
+          name : 'keyword_filters_name',
+          width : 410,
           xns : Roo.form,
           xtype : 'ComboBoxArray',
           items : [