X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Pman.Dialog.CoreNotifyRecurKeywords.bjs;h=7f90bd4ea63725d65dcff33bd8be1eabd54000ba;hb=61229b70e50bf98a966c52d17bcd81af76369208;hp=e016c863cc9937a18787860e11d48ac13bac46e1;hpb=d0f6a2ce84d210f0a3741dad016980e8a9d895df;p=Pman.Core

diff --git a/Pman.Dialog.CoreNotifyRecurKeywords.bjs b/Pman.Dialog.CoreNotifyRecurKeywords.bjs
index e016c863..7f90bd4e 100644
--- a/Pman.Dialog.CoreNotifyRecurKeywords.bjs
+++ b/Pman.Dialog.CoreNotifyRecurKeywords.bjs
@@ -23,11 +23,11 @@
    "background" : true,
    "title" : "Add Notification Keywords",
    "xtype" : "LayoutDialog",
-   "width" : 400,
+   "width" : 600,
    "$ xns" : "Roo",
    "closable" : false,
    "resizable" : false,
-   "height" : 150,
+   "height" : 180,
    "items" : [
     {
      "xtype" : "LayoutRegion",
@@ -44,7 +44,7 @@
      "items" : [
       {
        "listeners" : {
-        "|actioncomplete" : "function (_self, action)\n{\n  if (action.type == 'setdata') {\n        \n        if(_this.data.id){\n            _this.dialog.el.mask(\"Loading\");\n            this.load({ method: 'GET', params: { '_id' : _this.data.id }}); \n        }\n        \n        return;\n    }\n    if (action.type == 'load') {\n        _this.dialog.el.unmask();\n        return;\n    }\n    if (action.type == 'submit' ) {\n        _this.dialog.el.unmask();\n        _this.dialog.hide();\n\n        if (_this.callback) {\n           _this.callback.call(_this, action.result.data);\n        }\n        _this.form.reset();\n    }\n}\n",
+        "|actioncomplete" : "function (_self, action)\n{\n  if (action.type == 'setdata') {\n        \n        if(_this.data.id){\n            _this.dialog.el.mask(\"Loading\");\n            this.load({ method: 'GET', params: { '_id' : _this.data.id }}); \n        }\n        \n        return;\n    }\n    if (action.type == 'load') {\n        \n        _this.dialog.el.unmask();\n        \n        _this.data = action.result.data;\n        \n        if(typeof(_this.data.keywords) != 'undefined'){\n            var n = Roo.decode(_this.data.keywords);\n            _this.form.findField('keyword_filters').setValue(n);\n        }\n        \n        return;\n    }\n    if (action.type == 'submit' ) {\n        _this.dialog.el.unmask();\n        _this.dialog.hide();\n\n        if (_this.callback) {\n           _this.callback.call(_this, action.result.data);\n        }\n        _this.form.reset();\n    }\n}\n",
         "|rendered" : "function (form)\n{\n   _this.form = form;\n}"
        },
        "$ url" : "baseURL + '/Roo/Core_notify_recur.php'",
@@ -61,7 +61,7 @@
          "forceSelection" : true,
          "selectOnFocus" : true,
          "pageSize" : 20,
-         "Number width" : 200,
+         "Number width" : 400,
          "displayField" : "name",
          "emptyText" : "Select Campaign",
          "hiddenName" : "campaign_id",
@@ -72,7 +72,7 @@
          "typeAhead" : false,
          "editable" : true,
          "$ xns" : "Roo.form",
-         "name" : "camapign_id_name",
+         "name" : "campaign_id_name",
          "qtip" : "Select campaign",
          "queryParam" : "query[name]",
          "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b></div>",
@@ -109,16 +109,17 @@
          ]
         },
         {
-         "fieldLabel" : "Company Types",
-         "hiddenName" : "filter_company_type",
+         "Boolean allowBlank" : false,
+         "fieldLabel" : "Keywords",
+         "hiddenName" : "keyword_filters",
          "xtype" : "ComboBoxArray",
-         "width" : 210,
+         "width" : 410,
          "$ xns" : "Roo.form",
-         "name" : "filter_company_type_name",
+         "name" : "keyword_filters_name",
          "items" : [
           {
            "alwaysQuery" : true,
-           "listWidth" : 200,
+           "listWidth" : 400,
            "triggerAction" : "all",
            "fieldLabel" : "Keyword",
            "forceSelection" : true,
@@ -128,7 +129,7 @@
            "xtype" : "ComboBox",
            "allowBlank" : true,
            "editable" : true,
-           "width" : 200,
+           "width" : 400,
            "$ xns" : "Roo.form",
            "* prop" : "combo",
            "queryParam" : "query[keyword]",
@@ -186,7 +187,7 @@
     },
     {
      "listeners" : {
-      "|click" : "function() {\n    /*\n    var name =     _this.form.findField('name').getValue();\n    name = name.toUpperCase().replace(/[^A-Z]+/g, '');\n    if (!name.length) {\n        Roo.MessageBox.alert(\"Error\",\"Please fill in a valid name\");\n        return;\n    }\n    _this.form.findField('name').setValue(name);\n \n    _this.form.doAction('submit');\n    */\n    \n}"
+      "|click" : "function() {\n    \n    _this.form.doAction('submit');\n    \n}"
      },
      "text" : "OK",
      "xtype" : "Button",