webstaff: Add support for standalone grid menu items even when there is a menu label

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>

diff --git a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
index 86f2723..4805e9d 100644 (file)
--- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@ -8,17 +8,22 @@
 
   <div class="eg-grid-primary-label">{{mainLabel}}</div>
 
-  <div class="btn-group eg-grid-menuiitem" 
+  <div class="btn-group" 
     is-open="gridMenuIsOpen" ng-if="menuLabel" dropdown>
-    <button type="button" class="btn btn-default dropdown-toggle">
+    <button type="button" class="btn btn-default dropdown-toggle eg-grid-menui-item">
       {{menuLabel}}<span class="caret"></span>
     </button>
     <ul class="dropdown-menu">
-      <li ng-repeat="item in menuItems" ng-class="{divider: item.divider}">
+      <li ng-repeat="item in menuItems | filter : { standalone : 'false' }" ng-class="{divider: item.divider}">
         <a ng-if="!item.divider" href ng-disabled="item.disabled"
           ng-click="item.handler()">{{item.label}}</a>
       </li>
     </ul>
+    <button ng-if="!item.hidden()"
+      class="btn btn-default eg-grid-menui-item"
+      ng-disabled="item.disabled()"
+      ng-repeat="item in menuItems | filter : { standalone : 'true' }"
+      ng-click="item.handler()">{{item.label}}</button>
   </div>
 
   <!-- if no menu label is present, present menu-items as a 

diff --git a/Open-ILS/web/js/ui/default/staff/services/grid.js b/Open-ILS/web/js/ui/default/staff/services/grid.js
index 68c996f..337f4f9 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/services/grid.js
+++ b/Open-ILS/web/js/ui/default/staff/services/grid.js
@@ -1598,6 +1598,7 @@ angular.module('egGridMod',
         require : '^egGrid',
         scope : {
             label : '@',  
+            standalone : '=',  
             handler : '=', // onclick handler function
             divider : '=', // if true, show a divider only
             handlerData : '=', // if set, passed as second argument to handler
@@ -1607,6 +1608,7 @@ angular.module('egGridMod',
         link : function(scope, element, attrs, egGridCtrl) {
             egGridCtrl.addMenuItem({
                 label : scope.label,
+                standalone : scope.standalone ? true : false,
                 handler : scope.handler,
                 divider : scope.divider,
                 disabled : scope.disabled,