From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 7 Jan 2019 16:40:39 +0000 (-0500)
Subject: LP1779158 Import non-matching saved template repair
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ee4d3be232c5e894968b719d5be97a0165fb62c8;p=working%2FEvergreen.git

LP1779158 Import non-matching saved template repair

Fix issue in Vandelay import form templates where saved template name
did not match the form variable name.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts
index e9eb3f8e17..e3c2d3ded3 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts
@@ -24,7 +24,7 @@ const TEMPLATE_ATTRS = [
     'selectedBibSource',
     'selectedMatchSet',
     'mergeOnExact',
-    'importNonMatch',
+    'importNonMatching',
     'mergeOnBestMatch',
     'mergeOnSingleMatch',
     'autoOverlayAcqCopies',
diff --git a/Open-ILS/src/sql/Pg/upgrade/YYYY.data.vandelay-template-settings.sql b/Open-ILS/src/sql/Pg/upgrade/YYYY.data.vandelay-template-settings.sql
index bd104ef32d..30cc5dc05e 100644
--- a/Open-ILS/src/sql/Pg/upgrade/YYYY.data.vandelay-template-settings.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/YYYY.data.vandelay-template-settings.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('YYYY', :eg_version);
+--SELECT evergreen.upgrade_deps_block_check('YYYY', :eg_version);
 
 INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
 VALUES (