X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=blobdiff_plain;f=Pman.Tab.AdminCompanies.bjs;h=8b1cca5b740fc0d01ee65c94301876b120b0730a;hp=0e4221874428cf2112f1c9a65e2ab98e54791be4;hb=HEAD;hpb=8bded7eab2f8a199d1c2cbafa5ace85038076d33

diff --git a/Pman.Tab.AdminCompanies.bjs b/Pman.Tab.AdminCompanies.bjs
index 0e42218..3293cb7 100644
--- a/Pman.Tab.AdminCompanies.bjs
+++ b/Pman.Tab.AdminCompanies.bjs
@@ -12,6 +12,7 @@
   "ec211f7c20af43e742bf2570c3cb84f9" : "Add",
   "fc6f97505d89fe9277965c126744647a" : "No Companies found",
   "7dce122004969d56ae2e0245cb754d35" : "Edit",
+  "68be4837f6c739877233e527a996dd00" : "Merge",
   "155ca6a755e25c15ad7ce45e2f638f10" : "Displaying Companies{0} - {1} of {2}",
   "f2a6c498fb90ee345d997f888fce3b18" : "Delete",
   "a1fa27779242b4902f7ae3bdd5c6d508" : "Type",
@@ -27,8 +28,10 @@
    "title" : "Companies",
    "xtype" : "NestedLayoutPanel",
    "$ xns" : "Roo",
+   "Boolean background" : true,
    "items" : [
     {
+     "Object listeners" : "",
      "xtype" : "BorderLayout",
      "$ xns" : "Roo",
      "* prop" : "layout",
@@ -73,7 +76,7 @@
          "items" : [
           {
            "listeners" : {
-            "beforeload" : "function (_self, o)\n{\n   o.params = o.params || {};\n   try {\n       o.params['query[name]'] = _this.searchBox.getValue();\n   } catch(e) { return false; }\n}",
+            "beforeload" : "function (_self, o)\n{\n   o.params = o.params || {};\n   try {\n       o.params['search[name]'] = _this.searchBox.getValue();\n   } catch(e) { return false; }\n}",
             "load" : "function (_self, records, options)\n{\n   try {\n        Pman.Tab.AdminOffice.grid.footer.onClick('refresh');\n    } catch (e) {}\n}"
            },
            "xtype" : "Store",
@@ -86,7 +89,7 @@
              "listeners" : {
               "load" : "function (This, o, arg)\n{\n \n}"
              },
-             "$ url" : "baseURL + '/Roo/Companies.php'",
+             "$ url" : "baseURL + '/Roo/core_company'",
              "method" : "GET",
              "xtype" : "HttpProxy",
              "$ xns" : "Roo.data",
@@ -148,6 +151,20 @@
              "xtype" : "Fill",
              "$ xns" : "Roo.Toolbar"
             },
+            {
+             "listeners" : {
+              "|click" : "function()\n{\n    var s = _this.grid.getSelectionModel().getSelections();\n    \n    if (!s.length || (s.length > 1))  {\n        Roo.MessageBox.alert(\"Error\", s.length ? \"Select only one Row\" : \"Select a Row\");\n        return;\n    }\n    \n    Pman.Dialog.AdminCompanyMerge.show(s[0].data, function() {\n        _this.grid.footer.onClick('first');\n    }); \n    \n}\n"
+             },
+             "text" : "Merge",
+             "xtype" : "Button",
+             "cls" : "x-btn-text-icon",
+             "$ icon" : "Roo.rootURL + 'images/default/tree/leaf.gif'",
+             "$ xns" : "Roo.Toolbar"
+            },
+            {
+             "xtype" : "Separator",
+             "$ xns" : "Roo.Toolbar"
+            },
             {
              "listeners" : {
               "|click" : "function()\n{\n    if (!_this.dialog) {\n        return;\n        }\n    _this.dialog.show( { id : 0 } , function() {\n        _this.grid.footer.onClick('first');\n   }); \n}\n"
@@ -170,7 +187,7 @@
             },
             {
              "listeners" : {
-              "|click" : "function()\n{\n     Pman.genericDelete(_this, 'Companies'); \n}\n        "
+              "|click" : "function()\n{\n    Pman.genericDelete(_this, 'core_company'); \n}\n        "
              },
              "text" : "Delete",
              "xtype" : "Button",
@@ -188,7 +205,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",