sync

diff --git a/DataObjects/Mtrack_milestone.php b/DataObjects/Mtrack_milestone.php
index 54e0bdb..c9302a4 100644 (file)
--- a/DataObjects/Mtrack_milestone.php
+++ b/DataObjects/Mtrack_milestone.php
@@ -27,7 +27,7 @@ class Pman_MTrack_DataObjects_Mtrack_milestone extends DB_DataObject
     
     function project()
     {
-        $p = DB_DataObject::factory('Projects');
+        $p = DB_DataObject::factory('core_project');
         if (!$this->project_id) {
             return $p;
         }

diff --git a/Pman.Dialog.MTrackTicket.bjs b/Pman.Dialog.MTrackTicket.bjs
index 9104539..50cc704 100644 (file)
--- a/Pman.Dialog.MTrackTicket.bjs
+++ b/Pman.Dialog.MTrackTicket.bjs
@@ -106,20 +106,20 @@
         "|rendered" : "function (form)\n{\n    _this.form= form;\n}\n"
        },
        "$ url" : "baseURL + '/Roo/mtrack_ticket.php'",
-       "xtype" : "Form",
        "method" : "POST",
+       "xtype" : "Form",
        "style" : "margin:10px;width:1000px;margin-top:0px;",
        "$ xns" : "Roo.form",
        "items" : [
         {
          "xtype" : "Column",
-         "$ xns" : "Roo.form",
          "width" : 210,
+         "$ xns" : "Roo.form",
          "items" : [
           {
            "labelAlign" : "top",
-           "style" : "width:190px;",
            "legend" : "Properties",
+           "style" : "width:190px;",
            "xtype" : "FieldSet",
            "$ xns" : "Roo.form",
            "items" : [
@@ -159,8 +159,8 @@
                "items" : [
                 {
                  "$ url" : "baseURL + '/Roo/Projects.php'",
-                 "method" : "GET",
                  "xtype" : "HttpProxy",
+                 "method" : "GET",
                  "$ xns" : "Roo.data",
                  "* prop" : "proxy"
                 },
@@ -213,8 +213,8 @@
                "items" : [
                 {
                  "$ url" : "baseURL + '/Roo/mtrack_milestone.php'",
-                 "method" : "GET",
                  "xtype" : "HttpProxy",
+                 "method" : "GET",
                  "$ xns" : "Roo.data",
                  "* prop" : "proxy"
                 },
@@ -268,8 +268,8 @@
                "items" : [
                 {
                  "$ url" : "baseURL + '/Roo/core_enum.php'",
-                 "method" : "GET",
                  "xtype" : "HttpProxy",
+                 "method" : "GET",
                  "$ xns" : "Roo.data",
                  "* prop" : "proxy"
                 },
@@ -323,8 +323,8 @@
                "items" : [
                 {
                  "$ url" : "baseURL + '/Roo/core_enum.php'",
-                 "method" : "GET",
                  "xtype" : "HttpProxy",
+                 "method" : "GET",
                  "$ xns" : "Roo.data",
                  "* prop" : "proxy"
                 },
@@ -378,8 +378,8 @@
                "items" : [
                 {
                  "$ url" : "baseURL + '/Roo/core_enum.php'",
-                 "method" : "GET",
                  "xtype" : "HttpProxy",
+                 "method" : "GET",
                  "$ xns" : "Roo.data",
                  "* prop" : "proxy"
                 },
@@ -399,9 +399,9 @@
            ]
           },
           {
+           "style" : "width: 190px",
            "xtype" : "FieldSet",
            "legend" : "Resources",
-           "style" : "width: 190px",
            "$ xns" : "Roo.form",
            "items" : [
             {
@@ -446,9 +446,9 @@
                  "* prop" : "store",
                  "items" : [
                   {
-                   "$ url" : "baseURL + '/Roo/Person.php'",
-                   "method" : "GET",
+                   "$ url" : "baseURL + '/Roo/core_person'",
                    "xtype" : "HttpProxy",
+                   "method" : "GET",
                    "$ xns" : "Roo.data",
                    "* prop" : "proxy"
                   },
@@ -501,9 +501,9 @@
                  "* prop" : "store",
                  "items" : [
                   {
-                   "$ url" : "baseURL + '/Roo/Person.php'",
-                   "method" : "GET",
+                   "$ url" : "baseURL + '/Roo/core_person'",
                    "xtype" : "HttpProxy",
+                   "method" : "GET",
                    "$ xns" : "Roo.data",
                    "* prop" : "proxy"
                   },
@@ -531,8 +531,8 @@
              "items" : [
               {
                "fieldLabel" : "Estimated",
-               "style" : "align:right;",
                "xtype" : "NumberField",
+               "style" : "align:right;",
                "width" : 75,
                "$ xns" : "Roo.form",
                "name" : "estimated"
@@ -558,9 +558,9 @@
             "show" : "function (_self)\n{\n\n}",
             "render" : "function (_self)\n{\n  _this.summaryBox = _self;\n}"
            },
+           "style" : "width:410px",
            "xtype" : "FieldSet",
            "legend" : "Summary / Details",
-           "style" : "width:410px",
            "$ xns" : "Roo.form",
            "items" : [
             {
@@ -590,8 +590,8 @@
                 "check" : "function (_self, checked)\n{\n\n    if (!_this.form) {\n        return;\n    }\n    if (checked) {\n    \n         _this.form.findField('view_as').setValue('text');\n     }\n         \n    \n    \n     if (this.radio) {\n        return;\n    }\n     var md = _this.form.findField('view_as_markdown');\n\n    md.radio = true;\n    md.setValue(checked ? 0 : 1);\n    \n    md.radio = false;\n}"
                },
                "fieldLabel" : "View as",
-               "value" : 1,
                "xtype" : "Checkbox",
+               "value" : 1,
                "boxLabel" : "text",
                "width" : 100,
                "$ xns" : "Roo.form",
@@ -599,8 +599,8 @@
               },
               {
                "hideLabels" : true,
-               "style" : "float: left",
                "xtype" : "Row",
+               "style" : "float: left",
                "width" : 100,
                "$ xns" : "Roo.form",
                "items" : [

diff --git a/Pman.Dialog.MTrackTicket.js b/Pman.Dialog.MTrackTicket.js
index 5029c5f..6abd328 100644 (file)
--- a/Pman.Dialog.MTrackTicket.js
+++ b/Pman.Dialog.MTrackTicket.js
@@ -287,7 +287,7 @@ Pman.Dialog.MTrackTicket = {
                proxy : {
                 xtype : 'HttpProxy',
                 method : 'GET',
-                url : baseURL + '/Roo/core_project',
+                url : baseURL + '/Roo/Projects.php',
                 xns : Roo.data,
                 '|xns' : 'Roo.data'
                },
@@ -593,7 +593,7 @@ Pman.Dialog.MTrackTicket = {
                  proxy : {
                   xtype : 'HttpProxy',
                   method : 'GET',
-                  url : baseURL + '/Roo/Person.php',
+                  url : baseURL + '/Roo/core_person',
                   xns : Roo.data,
                   '|xns' : 'Roo.data'
                  },
@@ -653,7 +653,7 @@ Pman.Dialog.MTrackTicket = {
                  proxy : {
                   xtype : 'HttpProxy',
                   method : 'GET',
-                  url : baseURL + '/Roo/Person.php',
+                  url : baseURL + '/Roo/core_person',
                   xns : Roo.data,
                   '|xns' : 'Roo.data'
                  },