From be0950b242c25ccc3c976964752074e73bf909eb Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 31 Jul 2019 14:56:43 -0400
Subject: [PATCH] LP1831788 dialog dismissal and i18n repairs

Update sandbox dialog error handling to treat all error conditions as
errors.  Dialogs no longer produce an error on dismissal, they just
complete the obvservable.

Add i18n-placeholder attributes to some grid filter placeholder text.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../eg2/src/app/share/grid/grid-filter-control.component.html  |  9 ++++++---
 Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.ts    | 10 ++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
index 6367fb6e83..742cdca481 100644
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
@@ -14,7 +14,8 @@
             </div>
           </div>
         </div>
-        <eg-combobox [idlClass]="col.idlFieldDef.class" (onChange)="applyLinkFilter($event, col)" placeholder="Enter value to filter by"></eg-combobox>
+        <eg-combobox [idlClass]="col.idlFieldDef.class" (onChange)="applyLinkFilter($event, col)" 
+          i18n-placeholder placeholder="Enter value to filter by"></eg-combobox>
       </div>
     </div>
     <div *ngSwitchCase="'bool'">
@@ -67,7 +68,8 @@
             </div>
           </div>
         </div>
-        <input type="text" class="form-control" [(ngModel)]="col.filterValue" (keyup.enter)="applyFilter(col)" [disabled]="col.filterInputDisabled" placeholder="Enter value to filter by">
+        <input type="text" class="form-control" [(ngModel)]="col.filterValue" (keyup.enter)="applyFilter(col)" 
+          [disabled]="col.filterInputDisabled" i18n-placeholder placeholder="Enter value to filter by">
       </div>
     </div>
     <div *ngSwitchCase="'int'">
@@ -250,7 +252,8 @@
             </div>
           </div>
         </div>
-        <eg-org-select [applyOrgId]="col.filterValue" (onChange)="applyOrgFilter($event, col)" placeholder="Enter library to filter by" #ousel></eg-org-select>
+        <eg-org-select [applyOrgId]="col.filterValue" (onChange)="applyOrgFilter($event, col)" 
+          i18n-placeholder placeholder="Enter library to filter by" #ousel></eg-org-select>
       </div>
     </div>
     <div *ngSwitchDefault>I don't know how to filter {{col.name}} - {{col.datatype}}</div>
diff --git a/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.ts b/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.ts
index 1d47a070db..163a1cb723 100644
--- a/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.ts
@@ -351,13 +351,11 @@ export class SandboxComponent implements OnInit {
                     resolve(ok);
                 },
                 rejection => {
-                    if (!rejection.dismissed) {
-                        this.updateFailedString.current()
-                            .then(str => this.toast.danger(str));
-                        reject(rejection);
-                    }
+                    this.updateFailedString.current()
+                        .then(str => this.toast.danger(str));
+                    reject(rejection);
                 }
-            )
+            );
         });
     }
 }
-- 
2.11.0