lp1993824: grids bug fix; disabled attribute on eg-grid-toolbar-action

Signed-off-by: Jason Etheridge <jason@EquinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-action.component.ts b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-action.component.ts
index 6982525..213e150 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-action.component.ts
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-action.component.ts
@@ -24,7 +24,9 @@ export class GridToolbarActionComponent implements OnInit {
     @Input() action: (rows: any[]) => any;
 
     @Input() set disabled(d: boolean) {
-        this.toolbarAction.disabled = d;
+        if (this.toolbarAction) {
+            this.toolbarAction.disabled = d;
+        }
     }
     get disabled(): boolean {
         return this.toolbarAction.disabled;

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-menu.component.ts b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-menu.component.ts
index 87f4c2c..a5a578e 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-menu.component.ts
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-menu.component.ts
@@ -27,6 +27,9 @@ export class GridToolbarActionsMenuComponent {
     }
 
     shouldDisable(action: GridToolbarAction): boolean {
+        if (action.disabled) {
+            return true;
+        }
         if (action.disableOnRows) {
             return action.disableOnRows(this.gridContext.getSelectedRows());
         }