DataObjects/Core_notify_recur.php

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

diff --git a/Pman.Dialog.CoreNotifyRecurKeywords.bjs b/Pman.Dialog.CoreNotifyRecurKeywords.bjs
index 1da6dc0..fa44121 100644 (file)
--- 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",
@@ -61,7 +61,7 @@
          "forceSelection" : true,
          "selectOnFocus" : true,
          "pageSize" : 20,
-         "Number width" : 200,
+         "Number width" : 400,
          "displayField" : "name",
          "emptyText" : "Select Campaign",
          "hiddenName" : "campaign_id",
@@ -109,36 +109,35 @@
          ]
         },
         {
-         "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,
-           "idField" : "id",
+           "listWidth" : 400,
            "triggerAction" : "all",
-           "fieldLabel" : "company",
+           "fieldLabel" : "Keyword",
            "forceSelection" : true,
-           "displayField" : "display_name",
+           "displayField" : "keyword",
            "minChars" : 2,
            "valueField" : "id",
            "xtype" : "ComboBox",
            "allowBlank" : true,
            "editable" : true,
-           "width" : 200,
+           "width" : 400,
            "$ xns" : "Roo.form",
            "* prop" : "combo",
-           "queryParam" : "search[display_name]",
-           "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{display_name}</b> </div>",
-           "nameField" : "display_name",
+           "queryParam" : "query[keyword]",
+           "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{keyword}</b> </div>",
            "items" : [
             {
              "listeners" : {
-              "beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    // set more here\n    o.params.etype = 'COMPTYPE';\n    o.params.active  = 1;\n}\n"
+              "beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n    var s = _this.form.findField('campaign_id').getValue() * 1;\n    \n    if(isNaN(s) || s < 1){\n        return false;\n    }\n    \n    o.params.is_active  = 1;\n    o.params.is_keyword = 1;\n    o.params.project_id = s;\n}\n"
              },
              "xtype" : "Store",
              "remoteSort" : true,
@@ -147,7 +146,7 @@
              "* prop" : "store",
              "items" : [
               {
-               "$ url" : "baseURL + '/Roo/core_enum.php'",
+               "$ url" : "baseURL + '/Roo/clipping_keywords.php'",
                "xtype" : "HttpProxy",
                "method" : "GET",
                "$ xns" : "Roo.data",
@@ -157,7 +156,7 @@
                "id" : "code",
                "root" : "data",
                "xtype" : "JsonReader",
-               "$ fields" : "[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"etype\",\"type\":\"string\"}]",
+               "$ fields" : "[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"keyword\",\"type\":\"string\"}]",
                "$ xns" : "Roo.data",
                "* prop" : "reader",
                "totalProperty" : "total"
@@ -188,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",