From a079522f544eeb4fd90cabd93018811ffc7133ad Mon Sep 17 00:00:00 2001
From: Owen Leonard
Date: Thu, 7 Apr 2011 16:48:56 +0200
Subject: [PATCH] Fix for Bug 6114 - Conflicting warnings about Koha to MARC
links
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Removing incorrect message from marc_subfields_structure.tmpl and
moving the correct message from marctagstucture.tmpl into its place.
Also correcting the help file for marc_subfields_structure.mpl
Signed-off-by: Stéphane Delaune
Signed-off-by: Chris Cormack
---
.../prog/en/modules/admin/marc_subfields_structure.tmpl | 2 +-
.../intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl | 1 -
.../prog/en/modules/help/admin/marc_subfields_structure.tmpl | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index bb7fab29d7..671d3c9649 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -110,7 +110,7 @@
" value="" />
">hidden " name="hidden" value="" size="2" /> (see online help)
">Is a URL: (if checked, it means that the subfield is a URL and can be clicked)
- ">Link: " name="link" value="" size="10" maxlength="80" /> (e.g., Title or Local-Number) Warning: This value should not change after data has been added to your catalog
+ ">Link: " name="link" value="" size="10" maxlength="80" /> (e.g., Title or Local-Number) NOTE: If you change this value you must ask your administrator to run misc/batchRebuildBiblioTables.pl.
">Koha link:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
index e587967a96..1e9fb34d8c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
@@ -160,7 +160,6 @@ $(document).ready(function() {
-NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/batchRebuildBiblioTables.pl script.