php warnings

[Pman.MTrack] / Pman.Dialog.MTrackMilestoneMerge.bjs

diff --git a/ Pman.Dialog.MTrackMilestoneMerge.bjs b/ Pman.Dialog.MTrackMilestoneMerge.bjs
index 88290ef..f30cdfb 100644 (file)
--- a/ Pman.Dialog.MTrackMilestoneMerge.bjs
+++ b/ Pman.Dialog.MTrackMilestoneMerge.bjs
@@ -48,7 +48,7 @@
         "|actioncomplete" : "function (_self, action)\n{\n  if (action.type == 'setdata') {\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",
         "|rendered" : "function (form)\n{\n   _this.form = form;\n}"
        },
-       "$ url" : "baseURL + '/Roo/core_enum.php'",
+       "$ url" : "baseURL + '/Roo/mtrack_milestone'",
        "xtype" : "Form",
        "method" : "POST",
        "style" : "margin: 5px",
@@ -68,7 +68,7 @@
          "xtype" : "ComboBox",
          "minChars" : 2,
          "hiddenName" : "_merge_id",
-         "displayField" : "display_name",
+         "displayField" : "name",
          "valueField" : "id",
          "editable" : true,
          "Number listWidth" : 250,
@@ -76,20 +76,20 @@
          "$ xns" : "Roo.form",
          "name" : "merge_display_name",
          "queryParam" : "query[search]",
-         "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{display_name}</b> </div>",
+         "tpl" : "<div class=\"x-grid-cell-text x-btn button\">#{id} - <b>{name}</b> - {description} </div>",
          "items" : [
           {
            "listeners" : {
-            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n    o.params.active = 1;\n    o.params.etype = _this.data.etype;\n    o.params['!id'] = _this.data.id;\n    \n}\n"
+            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    o.params.project_id  = _this.form.findField('project_id').getValue();\n    o.params['!id'] = _this.data.id;\n    \n}\n"
            },
            "xtype" : "Store",
            "remoteSort" : true,
            "$ xns" : "Roo.data",
-           "$ sortInfo" : "{ direction : 'ASC', field: 'display_name' }",
+           "$ sortInfo" : "{ direction : 'ASC', field: 'id' }",
            "* prop" : "store",
            "items" : [
             {
-             "$ url" : "baseURL + '/Roo/Core_enum.php'",
+             "$ url" : "baseURL + '/Roo/mtrack_milestone.php'",
              "xtype" : "HttpProxy",
              "method" : "GET",
              "$ xns" : "Roo.data",
@@ -100,7 +100,6 @@
              "root" : "data",
              "xtype" : "JsonReader",
              "$ xns" : "Roo.data",
-             "$ fields" : "[\n    {\n        \"name\":\"id\",\n        \"type\":\"int\"\n    },\n    {\n        \"name\":\"display_name\",\n        \"type\":\"string\"\n    }\n]",
              "* prop" : "reader",
              "totalProperty" : "total"
             }
@@ -116,7 +115,7 @@
         {
          "xtype" : "Hidden",
          "$ xns" : "Roo.form",
-         "name" : "id"
+         "name" : "project_id"
         }
        ]
       }