From f38408f3397c9c148a88802f2a33509d19456033 Mon Sep 17 00:00:00 2001
From: Alan <alan@roojs.com>
Date: Wed, 9 Feb 2022 12:02:40 +0800
Subject: [PATCH] fix all staff default perms

---
 old/Pman.Tab.AdminPermManager.bjs | 14 +++++++-------
 old/Pman.Tab.AdminPermManager.js  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/old/Pman.Tab.AdminPermManager.bjs b/old/Pman.Tab.AdminPermManager.bjs
index d8a5b9c..f5d7785 100644
--- a/old/Pman.Tab.AdminPermManager.bjs
+++ b/old/Pman.Tab.AdminPermManager.bjs
@@ -30,23 +30,23 @@
      "items" : [
       {
        "xtype" : "LayoutRegion",
-       "tabPosition" : "top",
        "$ xns" : "Roo",
+       "tabPosition" : "top",
        "* prop" : "center"
       },
       {
        "xtype" : "LayoutRegion",
-       "width" : 200,
        "$ xns" : "Roo",
+       "width" : 200,
        "* prop" : "west"
       },
       {
        "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,
@@ -59,8 +59,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",
-         "enableDrop" : true,
          "xtype" : "Grid",
+         "enableDrop" : true,
          "ddGroup" : "groupDD",
          "loadMask" : true,
          "$ xns" : "Roo.grid",
@@ -79,8 +79,8 @@
            "items" : [
             {
              "$ url" : "baseURL + '/Roo/core_group.php'",
-             "method" : "GET",
              "xtype" : "HttpProxy",
+             "method" : "GET",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },
@@ -160,9 +160,9 @@
           },
           {
            "xtype" : "ColumnModel",
-           "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}",
+           "header" : "Name",
+           "$ 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\" + '</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[]",
            "dataIndex" : "name"
diff --git a/old/Pman.Tab.AdminPermManager.js b/old/Pman.Tab.AdminPermManager.js
index bdd15e0..d60658b 100644
--- a/old/Pman.Tab.AdminPermManager.js
+++ b/old/Pman.Tab.AdminPermManager.js
@@ -454,7 +454,7 @@ Pman.Tab.AdminPermManager = new Roo.XComponent({
                  return '<b>' + "Not in a Group" + '</b>';
              }
              if ((r.data.id == 0) && (_this.type == 0)) {
-                 return '<b>' + "All Staff (Default Permissions)" + '</b>';
+                 return '<b>' + "All Staff" + '</b>';
              }
              if ((r.data.id == 0) && (_this.type == 2)) {
                  return '<b>' + "Everybody" + '</b>';
-- 
2.39.2