Pman.Tab.MTrackTicket.bjs

Pman.Tab.MTrackTicket.js

diff --git a/Pman.Tab.MTrackTicket.bjs b/Pman.Tab.MTrackTicket.bjs
index 2ecbe20..a6b9ce0 100644 (file)
--- a/Pman.Tab.MTrackTicket.bjs
+++ b/Pman.Tab.MTrackTicket.bjs
@@ -156,7 +156,7 @@
           {
            "listeners" : {
             "update" : "function (_self, record, operation)\n{\n    Roo.log('update: ' + JSON.stringify(operation));\n    if (operation != 'commit') {\n        return;\n    }\n    // send things that might change..\n    new Pman.Request({\n        url : baseURL + '/Roo/mtrack_ticket',\n        method : 'POST',\n        params : {\n            id : record.data.id,\n            milestone_id : record.data.milestone_id,\n            priority_id : record.data.priority_id,\n            severity_id : record.data.severity_id,\n            classification_id : record.data.classification_id,\n            estimated : record.data.estimated,\n            developer_id : record.data.developer_id\n        },\n        success : function(res)\n        {\n            var r = res.data;\n            //Roo.log(r);\n            // do nothing?\n            record.modified = record.modified || {};\n            for (var k in r) {\n                // update the \n                 \n                if (k.match(/_id$/) || k.match(/_id_/) || k.match(/^status_/)) {\n     \n                    record.data[k] = r[k];\n                    record.modified[k] = r[k];\n                }\n            }\n            record.store.afterEdit(record);\n        }\n        // we should really have a failure - to reset to the old value.\n    });\n     \n    \n    \n}",
-            "beforeload" : "function (_self, options)\n{\n    \n   if (Pman.building) { return false; }\n    options.params =     options.params || {};\n    options.params['query[search]'] = _this.searchBox.getValue();\n    var sq =        options.params['query[viewtype]'] = _this.status.getValue(); \n    var pc = false;\n    var ps = false;\n    try {\n         pc = _this.grid.colModel.getIndexByDataIndex('project_id_name');\n        \n    } catch(e) {} \n    \n\n    if (!options.params['query[search]'].length || isNaN(options.params['query[search]'])) {\n            \n        \n        ps = _this.personSel.getValue();\n        ps = ps ? ps : 0;\n        if (ps ) {\n            options.params.developer_id = ps <0 ? 0 : ps;\n        }\n\n         \n        \n        \n        try { \n            options.params.project_id  = Pman.Tab.DocumentsTab.panel.getProjectId();\n        } catch(e) {\n            options.params.project_id  = MTrack? MTrack.projectCombo.getValue(): 0;\n        }\n        options.params.project_id =      options.params.project_id || undefined;\n     }\n     \n\n         \n           \n    if (  ps < 1 && pc !== false) {\n        _this.grid.colModel.setHidden(pc, true);\n        \n    }\n    \n    // project column\n    if (pc!== false) {\n         _this.grid.colModel.setHidden(pc, true);\n     }\n     \n    if (pc !== false && !options.params.project_id) {\n\n         _this.grid.colModel.setHidden(pc, false);       \n\n    }\n\n    options.params.limit = 999;\n    // columns...\n\n    \n    \n}"
+            "beforeload" : "function (_self, options)\n{\n    \n   if (Pman.building) { return false; }\n    options.params =     options.params || {};\n    options.params['query[search]'] = _this.searchBox.getValue();\n    var sq =        options.params['query[viewtype]'] = _this.status.getValue(); \n    var pc = false;\n    var ps = false;\n    try {\n         pc = _this.grid.colModel.getIndexByDataIndex('project_id_name');\n        \n    } catch(e) {} \n    \n\n    if (!options.params['query[search]'].length || isNaN(options.params['query[search]'])) {\n            \n        \n        ps = _this.personSel.getValue();\n        ps = ps ? ps : 0;\n        if (ps ) {\n            options.params.developer_id = ps <0 ? 0 : ps;\n        }\n\n         \n        \n        \n        try { \n            options.params.project_id  = Pman.Tab.DocumentsTab.panel.getProjectId();\n        } catch(e) {\n            options.params.project_id  = typeof(MTrack) != 'undefined' ? MTrack.projectCombo.getValue(): 0;\n        }\n        options.params.project_id =      options.params.project_id || undefined;\n     }\n     \n\n         \n           \n    if (  ps < 1 && pc !== false) {\n        _this.grid.colModel.setHidden(pc, true);\n        \n    }\n    \n    // project column\n    if (pc!== false) {\n         _this.grid.colModel.setHidden(pc, true);\n     }\n     \n    if (pc !== false && !options.params.project_id) {\n\n         _this.grid.colModel.setHidden(pc, false);       \n\n    }\n\n    options.params.limit = 999;\n    // columns...\n\n    \n    \n}"
            },
            "xtype" : "Store",
            "remoteSort" : true,

diff --git a/Pman.Tab.MTrackTicket.js b/Pman.Tab.MTrackTicket.js
index 173a0fd..fe8f447 100644 (file)
--- a/Pman.Tab.MTrackTicket.js
+++ b/Pman.Tab.MTrackTicket.js
@@ -650,7 +650,7 @@ Pman.Tab.MTrackTicket = new Roo.XComponent({
                   try { 
                       options.params.project_id  = Pman.Tab.DocumentsTab.panel.getProjectId();
                   } catch(e) {
-                      options.params.project_id  = MTrack? MTrack.projectCombo.getValue(): 0;
+                      options.params.project_id  = typeof(MTrack) != 'undefined' ? MTrack.projectCombo.getValue(): 0;
                   }
                   options.params.project_id =      options.params.project_id || undefined;
                }