[Koha-patches] [PATCH] Fix for Bug 6114 - Conflicting warnings about Koha to MARC links

[Chris Nighswonger]

This patch does not apply cleanly to 3.2.x. If is should, please fixup and
resubmit with [3.2.x] in the subject line.

Kind Regards,
Chris


On Thu, Apr 7, 2011 at 9:31 AM, Owen Leonard <oleonard at myacpl.org> wrote:

> 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
> ---
>  .../en/modules/admin/marc_subfields_structure.tmpl |    2 +-
>  .../prog/en/modules/admin/marctagstructure.tmpl    |    1 -
>  .../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 bb7fab2..671d3c9 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 @@
>                     <input type="text" name="defaultvalue"
> id="defaultvalue<!-- TMPL_VAR NAME="row" -->" value="<!-- TMPL_VAR
> NAME="defaultvalue" -->" /></li>
>                 <li><label for="hidden<!-- TMPL_VAR NAME="row"
> -->">hidden</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row"
> -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (see
> online help)</li>
>                 <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a
> URL:</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the
> subfield is a URL and can be clicked)</li>
> -                <li><label for="link<!-- TMPL_VAR NAME="row"
> -->">Link:</label><input type="text" id="link<!-- TMPL_VAR NAME="row" -->"
> name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="80"
> /> (e.g., Title or Local-Number) <span class="error"><em>Warning: This value
> should not change after data has been added to your catalog</em></span></li>
> +                <li><label for="link<!-- TMPL_VAR NAME="row"
> -->">Link:</label><input type="text" id="link<!-- TMPL_VAR NAME="row" -->"
> name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="80"
> /> (e.g., Title or Local-Number) <span class="error"><em>NOTE: If you change
> this value you must ask your administrator to run
> misc/batchRebuildBiblioTables.pl.</em></span></li>
>                 <li><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha
> link:</label><!-- TMPL_VAR NAME="kohafield" --></li>
>                        </ol>
>        </fieldset>
> 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 e587967..1e9fb34 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() {
>         <!--/TMPL_IF -->
>     </p>
>  </form>
> -<p>NOTE : if you change the link between a MARC subfield and a non-MARC
> field, ask your administrator to run misc/batchRebuildBiblioTables.pl
> script.</p>
>  <span id="pagertable_marctagstructure" class="pager">
>        <form class="formpager">&nbsp;<strong>page(s)</strong>&nbsp;:
>                <img src="<!-- TMPL_VAR name="interface"
> -->/prog/img/first.png" class="first"/>
> diff --git
> a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl
> b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl
> index 46ba414..82d1c1e 100644
> ---
> a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl
> +++
> b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl
> @@ -99,7 +99,7 @@ To edit the subfields associated with the tag, click
> 'Subfields' to the right of
>        <li>on a field that is a link (4xx) to reach another bib record. For
> example, put 011a in 464$x, will find the serials that are with this
> ISSN.</li>
>  </ul>
>  </li>
> -       <li style="color: #990000;">Important: This value should not change
> after data has been added to your catalog</li>
> +       <li style="color: #990000;">NOTE: If you change this value you must
> ask your administrator to run misc/batchRebuildBiblioTables.pl.</li>
>  </ul>
>  </li>
>  </ul>
> --
> 1.7.3
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20110416/ef10d8a1/attachment.htm>