From: Alan Knowles <alan@roojs.com>
Date: Tue, 23 Oct 2018 02:24:37 +0000 (+0800)
Subject: Pman.Tab.AdminCompanies.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=commitdiff_plain;h=ff058d13b6df8c8e0fa4c45d15fbd99de23d1708

Pman.Tab.AdminCompanies.bjs
Pman.Tab.AdminCompanies.js
---

diff --git a/Pman.Tab.AdminCompanies.bjs b/Pman.Tab.AdminCompanies.bjs
index 7f26ce6..5f2567f 100644
--- a/Pman.Tab.AdminCompanies.bjs
+++ b/Pman.Tab.AdminCompanies.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Tab.AdminCompanies",
  "parent" : "Pman.Tab.Admin",
  "title" : "Pman.Tab.AdminCompanies",
- "path" : "/home/benny/gitlive/Pman.Admin/Pman.Tab.AdminCompanies.bjs",
+ "path" : "/home/alan/gitlive/Pman.Admin/Pman.Tab.AdminCompanies.bjs",
  "permname" : "Admin.Companies",
  "modOrder" : "030",
  "strings" : {
@@ -25,8 +25,8 @@
  "items" : [
   {
    "region" : "center",
-   "xtype" : "NestedLayoutPanel",
    "title" : "Companies",
+   "xtype" : "NestedLayoutPanel",
    "$ xns" : "Roo",
    "items" : [
     {
@@ -52,9 +52,9 @@
        "listeners" : {
         "|activate" : "function() {\n    _this.panel = this;\n    if (_this.grid) {\n        _this.grid.footer.onClick('first');\n    }\n}"
        },
+       "region" : "center",
        "fitToframe" : true,
        "background" : true,
-       "region" : "center",
        "title" : "Companies",
        "xtype" : "GridPanel",
        "fitContainer" : true,
@@ -89,8 +89,8 @@
               "load" : "function (This, o, arg)\n{\n \n}"
              },
              "$ url" : "baseURL + '/Roo/core_company'",
-             "xtype" : "HttpProxy",
              "method" : "GET",
+             "xtype" : "HttpProxy",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },
@@ -204,7 +204,7 @@
            "$ renderer" : "function (v,x ,r) {\n    //return Pman.Dialog.Companies.comptypeListToString(r.data.isOwner ? 'OWNER' : v);\n    return v;\n}",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
-           "dataIndex" : "comptype"
+           "dataIndex" : "comptype_id_display_name"
           },
           {
            "xtype" : "ColumnModel",
@@ -228,8 +228,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "header" : "Tel",
            "width" : 100,
+           "header" : "Tel",
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
@@ -237,8 +237,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "header" : "Fax",
            "width" : 100,
+           "header" : "Fax",
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
@@ -266,8 +266,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 200,
            "header" : "Remarks",
+           "width" : 200,
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
diff --git a/Pman.Tab.AdminCompanies.js b/Pman.Tab.AdminCompanies.js
index 0feb97c..3b5a6be 100644
--- a/Pman.Tab.AdminCompanies.js
+++ b/Pman.Tab.AdminCompanies.js
@@ -575,7 +575,7 @@ Pman.Tab.AdminCompanies = new Roo.XComponent({
        colModel : [
         {
          xtype : 'ColumnModel',
-         dataIndex : 'comptype',
+         dataIndex : 'comptype_id_display_name',
          header : _this._strings['a1fa27779242b4902f7ae3bdd5c6d508'] /* Type */,
          renderer : function (v,x ,r) {
              //return Pman.Dialog.Companies.comptypeListToString(r.data.isOwner ? 'OWNER' : v);