From 640bc89c760315841a0804471e0ed9042b8f5f5e Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 2 Feb 2022 16:55:30 -0500
Subject: [PATCH] LP#1839341: Improve grid layouts

Correctly hide the ID column on the history grid, and disable tooltips
on action columns in both grids.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
---
 .../org-unit-setting-history-dialog.component.html                  | 6 +++---
 .../admin/local/org-unit-settings/org-unit-settings.component.html  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-history-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-history-dialog.component.html
index 082fdf2694..5967c534fb 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-history-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-history-dialog.component.html
@@ -17,13 +17,13 @@
             [disableSelect]="true" [disableMultiSelect]="true"
             [sortable]="false">
 
-            <eg-grid-column path="id" [index]=true label="ID" i18n-label hidden></eg-grid-column>
+            <eg-grid-column path="id" [index]=true label="ID" i18n-label [hidden]="true"></eg-grid-column>
             <eg-grid-column path="date_applied" label="Date Changed" datatype="timestamp" i18n-label></eg-grid-column>
             <eg-grid-column path="org.shortname" label="Location" i18n-label></eg-grid-column>
             <eg-grid-column path="original_value_str" label="Original Value" i18n-label></eg-grid-column>
             <eg-grid-column path="new_value_str" label="New Value" i18n-label></eg-grid-column>
             <eg-grid-column i18n-label label="Revert?" name="revert" 
-                [cellTemplate]="revertTemplate"></eg-grid-column>
+                [disableTooltip]="true" [cellTemplate]="revertTemplate"></eg-grid-column>
         </eg-grid>
       </div>
   </div>
@@ -36,4 +36,4 @@
         </a>
       </span>
     </ng-template>
-</ng-template>
\ No newline at end of file
+</ng-template>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.component.html
index 4352a5b41b..2ad7679535 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.component.html
@@ -55,9 +55,9 @@
     persistKey="admin.actor.org_unit_settings">
 
     <eg-grid-column i18n-label label="Edit" name="edit" [flex]="1"
-      [cellTemplate]="editCellTemplate"></eg-grid-column>
+      [disableTooltip]="true" [cellTemplate]="editCellTemplate"></eg-grid-column>
     <eg-grid-column i18n-label label="History" name="history" [flex]="1"
-      [cellTemplate]="historyCellTemplate"></eg-grid-column>
+      [disableTooltip]="true" [cellTemplate]="historyCellTemplate"></eg-grid-column>
     <eg-grid-column path="name" label="Name" i18n-label [hidden]="true" [flex]="3"></eg-grid-column>
     <eg-grid-column path="grp" label="Group" i18n-label [flex]="1"></eg-grid-column>
     <eg-grid-column path="label" label="Setting" [index]="true" i18n-label [flex]="4"></eg-grid-column>
-- 
2.11.0