fix limit on groups

diff --git a/BAdmin.perms.json b/BAdmin.perms.json
index b96fc73..bb42aca 100644 (file)
--- a/BAdmin.perms.json
+++ b/BAdmin.perms.json
@@ -1,9 +1,9 @@
 {      
-    "BAdmin" : [ "S", "", "View Administration Tab"],
-    "Logs" : [ "S", "", "Event Log Tab"],
-    "Company" : [ "ADEPS", "", "Companies Tab"],
-    "Staff" : [ "ADEPS", "", "System Account"],
+    "BAdmin" :         [ "S", "", "View Administration Tab"],
+    "Logs" :           [ "S", "", "Event Log Tab"],
+    "Company" :        [ "ADEPS", "", "Companies Tab"],
+    "Staff" :          [ "ADEPS", "", "System Account"],
     "EmailTemplates" : [ "ADEPS", "", "Email Templates"],
-    "CoreEnum" : [ "ADEPS", "", "Pulldown Options"]
+    "CoreEnum" :       [ "ADEPS", "", "Pulldown Options"]
 }
       
\ No newline at end of file

diff --git a/Pman.Tab.BAdminStaff.bjs b/Pman.Tab.BAdminStaff.bjs
index f966a72..b073ba9 100644 (file)
--- a/Pman.Tab.BAdminStaff.bjs
+++ b/Pman.Tab.BAdminStaff.bjs
@@ -391,9 +391,9 @@
           "cellclick" : "function (_self, el, rowIndex, columnIndex, e)\n{\n    var di = _this.permission_grid.colModel.getDataIndex(columnIndex);\n    \n    var r = _this.permission_grid.store.getAt(rowIndex);\n    \n    if(di == 'rightname' || di == 'descript' || r.data.id * 1 < 1) {\n        return;\n    }\n    \n    if(di == 'id'){\n        \n        var accessmask = r.data.accessmask.split('').sort().join('');\n        var fullmask = r.data.FullMask.split('').sort().join('');\n        \n        r.set('accessmask', (accessmask == fullmask) ? '' : r.data.FullMask);\n        \n        r.commit();\n        \n        return;\n    }\n    \n    var mapping = {\n        'add' : 'A',\n        'edit' : 'E',\n        'delete' : 'D',\n        'view' : 'S',\n        'print' : 'P'\n    };\n    \n    var target = mapping[di];\n    \n    if(r.data.FullMask.indexOf(target) === -1){\n        return;\n    }\n    \n    var accessmask = r.data.accessmask.split('');\n    \n    if(accessmask.indexOf(target) !== -1){\n        accessmask.splice(accessmask.indexOf(target), 1);\n    } else {\n        accessmask.push(target);\n    }\n    \n    r.set('accessmask', accessmask.sort().join(''));\n    \n    r.commit();\n    \n}",
           "render" : "function (_self)\n{\n    _this.permission_grid = this;\n    \n    if(_this.permission_panel.active) {\n        (function(){\n            _this.permission_grid.store.load({});\n        }).defer(50);\n    }\n}"
          },
+         "Boolean cellSelection" : true,
          "String cls" : "table-fixed",
          "Boolean footerShow" : false,
-         "Boolean cellSelection" : true,
          "boolean striped" : true,
          "boolean hover" : true,
          "xtype" : "Table",
@@ -646,7 +646,7 @@
           },
           {
            "listeners" : {
-            "beforeload" : "function (_self, options)\n{\n    if (!Pman.buildCompleted) {\n        return false;\n    }\n    options.params = options.params || {};\n    \n    options.params.type = 0;\n    \n    options.params._add_everyone = 1;\n\n}"
+            "beforeload" : "function (_self, options)\n{\n    if (!Pman.buildCompleted) {\n        return false;\n    }\n    options.params = options.params || {};\n    \n    options.params.type = 0;\n    \n    options.params._add_everyone = 1;\noptions.params.limit = 999;\n}"
            },
            "xtype" : "Store",
            "boolean remoteSort" : true,

diff --git a/Pman.Tab.BAdminStaff.js b/Pman.Tab.BAdminStaff.js
index 430a0bb..92f11f8 100644 (file)
--- a/Pman.Tab.BAdminStaff.js
+++ b/Pman.Tab.BAdminStaff.js
@@ -1382,7 +1382,7 @@ Pman.Tab.BAdminStaff = new Roo.XComponent({
               options.params.type = 0;
               
               options.params._add_everyone = 1;
-          
+          options.params.limit = 999;
           }
         },
         xns : Roo.data,

diff --git a/templates/Pman.Tab.BAdminStaff.html b/templates/Pman.Tab.BAdminStaff.html
index 21bc76c..f537539 100644 (file)
--- a/templates/Pman.Tab.BAdminStaff.html
+++ b/templates/Pman.Tab.BAdminStaff.html
@@ -4,12 +4,12 @@
     
 
         
-  <DIV class=" roo-layout-region roo-layout-panel roo-layout-panel-center" xbuilderid="roo-gen6" style="left: 0px; top: 0px; width: 1142px; height: 723px;">
+  <DIV class=" roo-layout-region roo-layout-panel roo-layout-panel-center" xbuilderid="roo-gen6" style="left: 0px; top: 0px; width: 995px; height: 529px;">
     <DIV unselectable="on" class="roo-unselectable roo-layout-panel-hd breadcrumb roo-layout-title-center" xbuilderid="roo-gen7" style="display: none;">
       <SPAN class="roo-unselectable roo-layout-panel-hd-text" unselectable="on">Account Management</SPAN>
       <DIV class="roo-unselectable roo-layout-panel-hd-tools" unselectable="on" xbuilderid="roo-gen8"></DIV>
     </DIV>
-    <DIV class="roo-layout-panel-body tab-content roo-tabs-top" xbuilderid="roo-gen9" style="overflow: hidden; height: 723px;">
+    <DIV class="roo-layout-panel-body tab-content roo-tabs-top" xbuilderid="roo-gen9" style="overflow: hidden; height: 529px;">
       <NAV class="navbar-light bg-light" xbuilderid="roo-gen24">
         <UL class="nav nav-tabs" role="tablist" xbuilderid="roo-gen25" style="display: none;">
           <LI class="nav-item" xbuilderid="roo-gen28">
@@ -17,29 +17,29 @@
           </LI>
         </UL>
       </NAV>
-      <DIV id="tab-body26" class=" tab-content roo-layout-tabs-body" style="position: relative; height: 723px;">
-        <DIV xbuilderid="roo-gen10" class=" roo-layout-container roo-layout-nested-layout tab-pane roo-layout-active-content" xtype="Roo.bootstrap.panel.Nest" style="position: relative; display: block; zoom: 1; visibility: visible; width: 1142px; height: 723px;">
-          <DIV class=" roo-layout-region roo-layout-panel roo-layout-panel-center" xbuilderid="roo-gen13" style="left: 255px; top: 0px; width: 887px; height: 723px;">
+      <DIV id="tab-body26" class=" tab-content roo-layout-tabs-body" style="position: relative; height: 529px;">
+        <DIV xbuilderid="roo-gen10" class=" roo-layout-container roo-layout-nested-layout tab-pane roo-layout-active-content" xtype="Roo.bootstrap.panel.Nest" style="position: relative; display: block; zoom: 1; visibility: visible; width: 995px; height: 529px;">
+          <DIV class=" roo-layout-region roo-layout-panel roo-layout-panel-center" xbuilderid="roo-gen13" style="left: 255px; top: 0px; width: 740px; height: 529px;">
             <DIV unselectable="on" class="roo-unselectable roo-layout-panel-hd breadcrumb roo-layout-title-center" xbuilderid="roo-gen14" style="display: none;">
               <SPAN class="roo-unselectable roo-layout-panel-hd-text" unselectable="on">Members List</SPAN>
               <DIV class="roo-unselectable roo-layout-panel-hd-tools" unselectable="on" xbuilderid="roo-gen15"></DIV>
             </DIV>
-            <DIV class="roo-layout-panel-body tab-content roo-tabs-top" xbuilderid="roo-gen16" style="overflow: hidden; height: 723px;">
-              <NAV class="navbar-light bg-light" xbuilderid="roo-gen99">
-                <UL class="nav nav-tabs" role="tablist" xbuilderid="roo-gen100" style="">
-                  <LI class="nav-item" xbuilderid="roo-gen103">
-                    <A class="nav-link active" href="#" unselectable="on" title="" xbuilderid="roo-gen102">Members List</A>
-                  </LI>
+            <DIV class="roo-layout-panel-body tab-content roo-tabs-top" xbuilderid="roo-gen16" style="overflow: hidden; height: 529px;">
+              <NAV class="navbar-light bg-light" xbuilderid="roo-gen114">
+                <UL class="nav nav-tabs" role="tablist" xbuilderid="roo-gen115" style="">
                   <LI class="nav-item" xbuilderid="roo-gen118">
-                    <A class="nav-link" href="#" unselectable="on" title="" xbuilderid="roo-gen117">Permission List</A>
+                    <A class="nav-link active" href="#" unselectable="on" title="" xbuilderid="roo-gen117">Members List</A>
+                  </LI>
+                  <LI class="nav-item" xbuilderid="roo-gen133">
+                    <A class="nav-link" href="#" unselectable="on" title="" xbuilderid="roo-gen132">Permission List</A>
                   </LI>
                 </UL>
               </NAV>
-              <DIV id="tab-body101" class=" tab-content roo-layout-tabs-body" style="position: relative; height: 681px;">
-                <DIV class="roo-layout-grid-wrapper roo-layout-inactive-content tab-pane" xbuilderid="roo-gen108" style="position: absolute; display: block; zoom: 1;"></DIV>
+              <DIV id="tab-body116" class=" tab-content roo-layout-tabs-body" style="position: relative; height: 487px;">
+                <DIV class="roo-layout-grid-wrapper roo-layout-inactive-content tab-pane" xbuilderid="roo-gen123" style="position: absolute; display: block; zoom: 1;"></DIV>
                 <DIV class="roo-layout-grid-wrapper  roo-layout-active-content tab-pane" xbuilderid="roo-gen30" style="position: relative; display: block; zoom: 1; visibility: visible;">
                   <DIV xbuilderid="roo-gen31">
-                    <DIV class="navbar roo-navbar-simple navbar-light bg-light" xbuilderid="roo-comp-1004" style="width: 855px;">
+                    <DIV class="navbar roo-navbar-simple navbar-light bg-light" xbuilderid="roo-comp-1004" style="width: 708px;">
                       <DIV class="x-dlg-mask" xbuilderid="roo-gen32" style="width: 32px; height: 16px; display: none;"></DIV>
                       <UL class="nav navbar-nav mr-auto" xbuilderid="roo-comp-1006" style="width: 100%;">
                         <DIV class="nav-item" xbuilderid="roo-comp-1008" style="width: 100%;">
@@ -87,36 +87,36 @@
                       </UL>
                     </DIV>
                   </DIV>
-                  <DIV xbuilderid="roo-comp-1033" class="table-fixed roo-layout-component-panel" style="width: 887px; height: 607px;">
+                  <DIV xbuilderid="roo-comp-1033" class="table-fixed roo-layout-component-panel" style="width: 740px; height: 413px;">
                     <TABLE class="table table-body-fixed table-hover table-responsive table-fixed">
-                      <THEAD xbuilderid="roo-gen66">
+                      <THEAD xbuilderid="roo-gen73">
                         <TR>
-                          <TH class="sortable col-xs-1 col-1 col-sm-1 col-md-1" style=" text-align:center;" sort="active" xbuilderid="roo-gen68">
+                          <TH class="sortable col-xs-1 col-1 col-sm-1 col-md-1" style=" text-align:center;" sort="active" xbuilderid="roo-gen75">
                             <I class="glyphicon"></I>Active
                           </TH>
-                          <TH class="sortable col-xs-3 col-3 col-sm-3 col-md-3" style="" sort="name" xbuilderid="roo-gen69">
+                          <TH class="sortable col-xs-3 col-3 col-sm-3 col-md-3" style="" sort="name" xbuilderid="roo-gen76">
                             <I class="glyphicon"></I>Name
                           </TH>
-                          <TH class="sortable col-xs-2 col-2 col-sm-2 col-md-2" style="" sort="role" xbuilderid="roo-gen70">
+                          <TH class="sortable col-xs-2 col-2 col-sm-2 col-md-2" style="" sort="role" xbuilderid="roo-gen77">
                             <I class="glyphicon"></I>Role / Position
                           </TH>
                           <TH class="x-hcol-3 col-xs-2 col-2 col-sm-2 col-md-2" style="" sort="phone">Phone</TH>
-                          <TH class="sortable col-xs-4 col-4 col-sm-2 col-md-4" style="" sort="email" xbuilderid="roo-gen71">
+                          <TH class="sortable col-xs-4 col-4 col-sm-2 col-md-4" style="" sort="email" xbuilderid="roo-gen78">
                             <I class="glyphicon"></I>Email
                           </TH>
                         </TR>
                       </THEAD>
-                      <TBODY xbuilderid="roo-gen65" style="width: 887px; height: 461px;">
-                        <TR xbuilderid="roo-gen107" style="width: 887px;">
+                      <TBODY xbuilderid="roo-gen72" style="width: 740px; height: 243px;">
+                        <TR xbuilderid="roo-gen122" style="width: 740px;">
                           <TD colspan="5"></TD>
                         </TR>
                       </TBODY>
-                      <TFOOT xbuilderid="roo-gen67">
-                        <TR xbuilderid="roo-gen105" style="width: 887px;">
-                          <TD colspan="5" xbuilderid="roo-gen106" style="width: 887px;">
+                      <TFOOT xbuilderid="roo-gen74">
+                        <TR xbuilderid="roo-gen120" style="width: 740px;">
+                          <TD colspan="5" xbuilderid="roo-gen121" style="width: 740px;">
                             <DIV class="navbar roo-navbar-simple navbar-light bg-light" xbuilderid="roo-comp-1034" name="footer">
                               <UL class="nav nav-PagingToolbar navbar-nav"></UL>
-                              <DIV class="x-dlg-mask" xbuilderid="roo-gen78" style="width: 32px; height: 16px; display: none;"></DIV>
+                              <DIV class="x-dlg-mask" xbuilderid="roo-gen86" style="width: 32px; height: 16px; display: none;"></DIV>
                               <DIV class="btn-group pagination" xbuilderid="roo-comp-1035">
                                 <BUTTON class="btn roo-button btn-outline-secondary btn-default prev btn-outline-secondary" disabled="disabled" xbuilderid="roo-comp-1037" tooltip="First Page">
                                   <SPAN class="roo-button-text"> <I class="fa fa-step-backward"></I></SPAN>
@@ -125,7 +125,7 @@
                                   <SPAN class="roo-button-text"> <I class="fa fa-backward"></I></SPAN>
                                 </BUTTON>
                                 <BUTTON class="btn roo-button btn-outline-secondary btn-default x-paging-position  btn-outline-secondary" disabled="disabled" xbuilderid="roo-comp-1039">
-                                  <SPAN class="roo-button-text">Page<INPUT type="text" size="3" value="1" class="x-grid-page-number" xbuilderid="roo-gen87"></INPUT><SPAN class="x-paging-after" xbuilderid="roo-gen90">of 1</SPAN></SPAN>
+                                  <SPAN class="roo-button-text">Page<INPUT type="text" size="3" value="1" class="x-grid-page-number" xbuilderid="roo-gen99"></INPUT><SPAN class="x-paging-after" xbuilderid="roo-gen102">of 1</SPAN></SPAN>
                                 </BUTTON>
                                 <BUTTON class="btn roo-button btn-outline-secondary btn-default next btn-outline-secondary" disabled="disabled" xbuilderid="roo-comp-1040" tooltip="Next Page">
                                   <SPAN class="roo-button-text"> <I class="fa fa-forward"></I></SPAN>
@@ -150,69 +150,43 @@
               </DIV>
             </DIV>
           </DIV>
-          <DIV class=" roo-layout-region roo-layout-panel roo-layout-panel-west" xbuilderid="roo-gen17" style="width: 250px; left: 0px; top: 0px; height: 723px;">
+          <DIV class=" roo-layout-region roo-layout-panel roo-layout-panel-west" xbuilderid="roo-gen17" style="width: 250px; left: 0px; top: 0px; height: 529px;">
             <DIV unselectable="on" class="roo-unselectable roo-layout-panel-hd breadcrumb roo-layout-title-west" xbuilderid="roo-gen18" style="display: none;">
               <SPAN class="roo-unselectable roo-layout-panel-hd-text" unselectable="on">Groups</SPAN>
               <DIV class="roo-unselectable roo-layout-panel-hd-tools" unselectable="on" xbuilderid="roo-gen19"></DIV>
             </DIV>
-            <DIV class="roo-layout-panel-body tab-content roo-tabs-top" xbuilderid="roo-gen20" style="overflow: hidden; height: 723px;">
-              <NAV class="navbar-light bg-light" xbuilderid="roo-gen142">
-                <UL class="nav nav-tabs" role="tablist" xbuilderid="roo-gen143" style="display: none;">
-                  <LI class="nav-item" xbuilderid="roo-gen146">
-                    <A class="nav-link active" href="#" unselectable="on" title="" xbuilderid="roo-gen145">Groups</A>
+            <DIV class="roo-layout-panel-body tab-content roo-tabs-top" xbuilderid="roo-gen20" style="overflow: hidden; height: 529px;">
+              <NAV class="navbar-light bg-light" xbuilderid="roo-gen159">
+                <UL class="nav nav-tabs" role="tablist" xbuilderid="roo-gen160" style="display: none;">
+                  <LI class="nav-item" xbuilderid="roo-gen163">
+                    <A class="nav-link active" href="#" unselectable="on" title="" xbuilderid="roo-gen162">Groups</A>
                   </LI>
                 </UL>
               </NAV>
-              <DIV id="tab-body144" class=" tab-content roo-layout-tabs-body" style="position: relative; height: 723px;">
-                <DIV class="roo-layout-grid-wrapper  roo-layout-active-content tab-pane" xbuilderid="roo-gen120" style="position: relative; display: block; zoom: 1; visibility: visible;">
-                  <DIV xbuilderid="roo-gen121">
+              <DIV id="tab-body161" class=" tab-content roo-layout-tabs-body" style="position: relative; height: 529px;">
+                <DIV class="roo-layout-grid-wrapper  roo-layout-active-content tab-pane" xbuilderid="roo-gen135" style="position: relative; display: block; zoom: 1; visibility: visible;">
+                  <DIV xbuilderid="roo-gen136">
                     <DIV class="navbar roo-navbar-simple navbar-light bg-light" xbuilderid="roo-comp-1045" style="width: 218px;">
-                      <DIV class="x-dlg-mask" xbuilderid="roo-gen122" style="width: 32px; height: 16px; display: none;"></DIV>
+                      <DIV class="x-dlg-mask" xbuilderid="roo-gen137" style="width: 32px; height: 16px; display: none;"></DIV>
                       <UL class="nav navbar-nav mr-auto" xbuilderid="roo-comp-1047">
                         <DIV class="nav-item account-management-group-nav-item" xbuilderid="roo-comp-1049">
                           <BUTTON class="btn roo-button btn-outline-secondary btn-default dropdown dropdown-toggle" xbuilderid="roo-comp-1051">
                             <SPAN class="roo-button-text">Manage Groups</SPAN> 
                             <SPAN class="caret"></SPAN>
-                            <UL class="dropdown-menu" style="z-index:1000" xbuilderid="roo-comp-1053">
-                              <LI class="dropdown-menu-item" xbuilderid="roo-comp-1055">
-                                <A class="dropdown-item" href="#">
-                                  <I class="fa fa-fa fa-plus"></I>
-                                  <SPAN>Add</SPAN>
-                                </A>
-                              </LI>
-                              <LI class="dropdown-menu-item" xbuilderid="roo-comp-1057">
-                                <A class="dropdown-item" href="#">
-                                  <I class="fa fa-fa fa-pencil"></I>
-                                  <SPAN>Edit</SPAN>
-                                </A>
-                              </LI>
-                              <LI class="dropdown-menu-item" xbuilderid="roo-comp-1059">
-                                <A class="dropdown-item" href="#">
-                                  <I class="fa fa-fa fa-trash"></I>
-                                  <SPAN>Delete</SPAN>
-                                </A>
-                              </LI>
-                              <LI class="dropdown-menu-item" xbuilderid="roo-comp-1061">
-                                <A class="dropdown-item" href="#">
-                                  <I class="fa fa-fa fa-refresh"></I>
-                                  <SPAN>Reload</SPAN>
-                                </A>
-                              </LI>
-                            </UL>
                           </BUTTON>
                         </DIV>
                       </UL>
                     </DIV>
                   </DIV>
-                  <DIV xbuilderid="roo-comp-1063" class="table-fixed roo-layout-component-panel" style="width: 250px; height: 669px;">
+                  <DIV xbuilderid="roo-comp-1063" class="table-fixed roo-layout-component-panel" style="width: 250px; height: 475px;">
                     <TABLE class="table table-body-fixed table-striped table-hover table-responsive table-fixed">
-                      <THEAD xbuilderid="roo-gen137">
+                      <THEAD xbuilderid="roo-gen153">
                         <TR>
                           <TH class="x-hcol-0 col-xs-12 col-12 col-sm-12 col-md-12" style="" sort="name">Name</TH>
                         </TR>
                       </THEAD>
-                      <TBODY xbuilderid="roo-gen136" style="width: 250px; height: 620px;">
-                        <TR xbuilderid="roo-gen148" style="width: 250px;">
+                      <TBODY xbuilderid="roo-gen152" style="width: 250px; height: 426px;">
+                        <TR xbuilderid="roo-gen165" style="width: 250px;">
                           <TD colspan="1"></TD>
                         </TR>
                       </TBODY>
@@ -222,9 +196,35 @@
               </DIV>
             </DIV>
           </DIV>
-          <DIV xbuilderid="roo-gen17-split" class="roo-layout-split roo-layout-split-west roo-splitbar-h roo-layout-split-h" style="left: 250px; top: 0px; height: 723px;"> </DIV>
+          <DIV xbuilderid="roo-gen17-split" class="roo-layout-split roo-layout-split-west roo-splitbar-h roo-layout-split-h" style="left: 250px; top: 0px; height: 529px;"> </DIV>
         </DIV>
       </DIV>
     </DIV>
   </DIV>
   <DIV xbuilderid="roo-gen21" class=" x-unselectable roo-splitbar-proxy roo-splitbar-proxy-h"></DIV>
+  <UL class="dropdown-menu shadow" style="z-index:1000" xbuilderid="roo-comp-1053">
+    <LI class="dropdown-menu-item" xbuilderid="roo-comp-1055">
+      <A class="dropdown-item" href="#">
+        <I class="fa fa-fa fa-plus"></I>
+        <SPAN>Add</SPAN>
+      </A>
+    </LI>
+    <LI class="dropdown-menu-item" xbuilderid="roo-comp-1057">
+      <A class="dropdown-item" href="#">
+        <I class="fa fa-fa fa-pencil"></I>
+        <SPAN>Edit</SPAN>
+      </A>
+    </LI>
+    <LI class="dropdown-menu-item" xbuilderid="roo-comp-1059">
+      <A class="dropdown-item" href="#">
+        <I class="fa fa-fa fa-trash"></I>
+        <SPAN>Delete</SPAN>
+      </A>
+    </LI>
+    <LI class="dropdown-menu-item" xbuilderid="roo-comp-1061">
+      <A class="dropdown-item" href="#">
+        <I class="fa fa-fa fa-refresh"></I>
+        <SPAN>Reload</SPAN>
+      </A>
+    </LI>
+  </UL>