From 955d50094e8883cbe62139e6e1d832784ca1c090 Mon Sep 17 00:00:00 2001
From: Kyle Huckins <khuckins@catalyte.io>
Date: Mon, 25 Nov 2019 18:05:48 +0000
Subject: [PATCH] lp1839341 Minor Tweaks

- Add aria-label to Filter Input
- Add Name column to settings grid
- Correctly Parse HTML links in setting descriptions
- Correctly clear Value column when deleting settings

Signed-off-by: Kyle Huckins <khuckins@catalyte.io>

 Changes to be committed:
	modified:   Open-ILS/src/eg2/src/app/staff/amin/local/org-unit-settings/org-unit-settings.component.html
	modified:   Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
	modified:   Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.component.ts

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
---
 .../edit-org-unit-setting-dialog.component.html    |    2 +-
 .../org-unit-settings.component.html               |    3 +++
 .../org-unit-settings.component.ts                 |    1 +
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
index eae497c..a2ef464 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
@@ -14,7 +14,7 @@
     </div>
     <div class="row justify-content-center">
         <div class="col">
-            <span i18n>{{entry.description}}</span>
+            <span i18n [innerHTML]="entry.description"></span>
         </div>
     </div>
     <div class="row mt-3">
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 1da8149..8c1e88d 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
@@ -28,6 +28,8 @@
             class="form-control"
             [(ngModel)]="filterString"
             (blur)="applyFilter()"
+            aria-label="Filter Settings"
+            i18n-aria-label
         />
         <button class="btn btn-outline-dark mr-1" i18n>Filter</button>
         <button class="btn btn-outline-dark mr-1" i18n
@@ -55,6 +57,7 @@
       [cellTemplate]="editCellTemplate"></eg-grid-column>
     <eg-grid-column i18n-label label="History" name="history"
       [cellTemplate]="historyCellTemplate"></eg-grid-column>
+    <eg-grid-column path="name" label="Name" i18n-label [hidden]="true"></eg-grid-column>
     <eg-grid-column path="grp" label="Group" i18n-label></eg-grid-column>
     <eg-grid-column path="label" label="Setting" [index]="true" i18n-label></eg-grid-column>
     <eg-grid-column path="context.shortname()" label="Context" i18n-label></eg-grid-column>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.component.ts
index 9422b62..5d4dd80 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.component.ts
@@ -243,6 +243,7 @@ export class OrgUnitSettingsComponent {
                     setting => setting.name == entry.name
                 )[0];
                 settingsObj.value = null;
+                settingsObj.value_str = null;
                 settingsObj._org_unit = null;
                 settingsObj.context = null;
             }
-- 
1.7.2.5