DataObjects/Companies.php

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

diff --git a/Pman.Dialog.CoreNotifyRecurKeywords.js b/Pman.Dialog.CoreNotifyRecurKeywords.js
index 02ae087..bddf1de 100644 (file)
--- a/Pman.Dialog.CoreNotifyRecurKeywords.js
+++ b/Pman.Dialog.CoreNotifyRecurKeywords.js
@@ -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]',
@@ -275,6 +275,7 @@ Pman.Dialog.CoreNotifyRecurKeywords = {
 
           },
           '|xns' : 'Roo.form',
+          allowBlank : false,
           fieldLabel : 'Keywords',
           hiddenName : 'keyword_filters',
           name : 'keyword_filters_name',