From: Alan Knowles <alan@roojs.com>
Date: Thu, 4 May 2017 03:32:30 +0000 (+0800)
Subject: Pman.Tab.AdminContactsGroup.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=commitdiff_plain;h=9cc69726e2bf11f4ba3ef1bc88e9cded2b762f3f

Pman.Tab.AdminContactsGroup.bjs
Pman.Tab.AdminContactsGroup.js
---

diff --git a/Pman.Tab.AdminContactsGroup.bjs b/Pman.Tab.AdminContactsGroup.bjs
index 1c4c6e0..3c73884 100644
--- a/Pman.Tab.AdminContactsGroup.bjs
+++ b/Pman.Tab.AdminContactsGroup.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Tab.AdminContactsGroup",
  "parent" : "Pman.Tab.AdminContactsManager",
  "title" : "Pman.Tab.AdminContactsGroup",
- "path" : "/home/edward/gitlive/Pman.Admin/Pman.Tab.AdminContactsGroup.bjs",
+ "path" : "/home/alan/gitlive/Pman.Admin/Pman.Tab.AdminContactsGroup.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
@@ -19,9 +19,9 @@
    "listeners" : {
     "|activate" : "function() {\n    _this.panel = this;\n    if (_this.grid) {\n        _this.grid.ds.load({});\n    }\n}"
    },
+   "fitToframe" : true,
    "background" : true,
    "region" : "west",
-   "fitToframe" : true,
    "title" : "Groups",
    "xtype" : "GridPanel",
    "fitContainer" : true,
@@ -34,8 +34,8 @@
       "|render" : "function() \n{\n    _this.grid = this; \n    _this.dialog = Pman.Dialog.Groups;\n    if (_this.panel.active) {\n        _this.grid.ds.load({});\n    }\n}"
      },
      "autoExpandColumn" : "name",
-     "xtype" : "Grid",
      "enableDrop" : true,
+     "xtype" : "Grid",
      "ddGroup" : "groupDD",
      "loadMask" : true,
      "$ xns" : "Roo.grid",
@@ -53,9 +53,9 @@
        "* prop" : "dataSource",
        "items" : [
         {
-         "$ url" : "baseURL + '/Roo/Groups.php'",
-         "xtype" : "HttpProxy",
+         "$ url" : "baseURL + '/Roo/core_group'",
          "method" : "GET",
+         "xtype" : "HttpProxy",
          "$ xns" : "Roo.data",
          "* prop" : "proxy"
         },
@@ -135,8 +135,8 @@
       },
       {
        "xtype" : "ColumnModel",
-       "width" : 200,
        "header" : "Name",
+       "width" : 200,
        "$ renderer" : "function(v,x,r) { \n    if (r.data.id == -1) {\n        return '<b>' + \"Not in a Group\" + '</b>';\n    }\n    if ((r.data.id == 0) && (_this.type == 0)) {\n        return '<b>' + \"All Staff (Default Permissions)\" + '</b>';\n    }\n    if ((r.data.id == 0) && (_this.type == 2)) {\n        return '<b>' + \"Everybody\" + '</b>';\n    }\n    if (r.data.id == 0) {\n        return '<b>' + \"All Staff\" + '</b>';\n    }\n    if (v == 'Administrators') {\n        return '<b>' + \"Adminstrators\" + '</b>';\n    }\n    if (r.data.leader) {\n        return v + ' (' + r.data.leader_name + ')';\n    }\n    \n    return v;\n}",
        "$ xns" : "Roo.grid",
        "* prop" : "colModel[]",
diff --git a/Pman.Tab.AdminContactsGroup.js b/Pman.Tab.AdminContactsGroup.js
index 03227ae..95f1d88 100644
--- a/Pman.Tab.AdminContactsGroup.js
+++ b/Pman.Tab.AdminContactsGroup.js
@@ -23,7 +23,7 @@ Pman.Tab.AdminContactsGroup = new Roo.XComponent({
   name     : "Pman.Tab.AdminContactsGroup",
   disabled : false, 
   permname : '', 
-  _tree : function()
+  _tree : function(_data)
   {
    var _this = this;
    var MODULE = this;
@@ -201,7 +201,7 @@ Pman.Tab.AdminContactsGroup = new Roo.XComponent({
      proxy : {
       xtype : 'HttpProxy',
       method : 'GET',
-      url : baseURL + '/Roo/Groups.php',
+      url : baseURL + '/Roo/core_group',
       xns : Roo.data,
       '|xns' : 'Roo.data'
      },