From 6c0061d10e5b323e0ad7aa12e3c2d348c4ffb0e3 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 6 Jan 2021 10:23:22 -0500
Subject: [PATCH] LP1910409 MARC Batch Edit Allows CSV Column 0

Fixes an issue where the "Go!" button was disabled in the MARC Batch
Edit interface when chosing column "0" for a CSV file updload.

Form now prevents values below 0 from being applied (via the number
spinner) and treats all column values >= 0 as valid.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
---
 Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.html | 2 +-
 Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.html b/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.html
index d3cbb1306d..bfa2952226 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.html
@@ -140,7 +140,7 @@
           <div class="row">
             <div class="col-lg-3" i18n>Column: </div>
             <div class="col-lg-3 d-flex">
-              <input type="number" class="form-control" [(ngModel)]="csvColumn"/>
+              <input min="0" type="number" class="form-control" [(ngModel)]="csvColumn"/>
               <span class="pl-2" i18n> of </span>
             </div>
             <div class="col-lg-6">
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.ts
index 84c7f354dd..81e391302b 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.ts
@@ -183,7 +183,7 @@ export class MarcBatchComponent implements OnInit {
             return !this.bucket;
 
         } else if (this.source === 'c') {
-            return (!this.csvColumn || !this.csvFile);
+            return (this.csvColumn < 0 || !this.csvFile);
 
         } else if (this.source === 'r') {
             return !this.recordId;
-- 
2.11.0