Attachment 40606 Details for Bug 11674 – (squashed commits) qa fix and followup

[patch] (squashed commits) qa fix and followup

squashed-commits-qa-fix-and-followup.patch (text/plain), 4.27 KB, created by Indranil Das Gupta on 2015-06-24 21:27:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Indranil Das Gupta

Created: 2015-06-24 21:27:12 UTC

Size: 4.27 KB

patch

obsolete

>From a24e28a174657aedcd2a2d83952a6e0e41bc0f37 Mon Sep 17 00:00:00 2001
>From: Indranil Das Gupta <indradg@gmail.com>
>Date: Wed, 24 Jun 2015 01:19:57 +0530
>Subject: [PATCH] (squashed commits) qa fix and followup
>
>1/ the qa fix addresses the QA comments from Jonathan Druart in
>comment #6.
>
>2/ qa followup added missing IGNORE to INSERT statement in
>updatedatabase.pl for compliance with Bug 9071
>
>http://bugs.koha-community.org/show_bug.cgi?id=11674
>---
> installer/data/mysql/sysprefs.sql                                | 2 +-
> installer/data/mysql/updatedatabase.pl                           | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index a6d2898..92c7847 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -199,9 +199,9 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('LocalHoldsPriorityPatronControl',  'PickupLibrary',  'HomeLibrary|PickupLibrary',  'decides if the feature operates using the library set as the patron''s home library, or the library set as the pickup library for the given hold.',  'Choice'),
> ('ManInvInNoissuesCharge','1',NULL,'MANUAL_INV charges block checkouts (added to noissuescharge).','YesNo'),
> ('MARCAuthorityControlField008','|| aca||aabn           | a|a     d',NULL,'Define the contents of MARC21 authority control field 008 position 06-39','Textarea'),
>+('MarcFieldDocURL', NULL, NULL, 'URL used for MARC field documentation. Following substitutions are available: {MARC} = marc flavour, eg. "MARC21" or "UNIMARC". {FIELD} = field number, eg. "000" or "048". {LANG} = user language, eg. "en" or "fi-FI"', 'free'),
> ('MarcFieldsToOrder','',NULL,'Set the mapping values for a new order line created from a MARC record in a staged file. In a YAML format.','textarea'),
> ('MARCOrgCode','OSt','','Define MARC Organization Code for MARC21 records - http://www.loc.gov/marc/organizations/orgshome.html','free'),
>-('MarcFieldDocURL', NULL, NULL, 'URL used for MARC field documentation. Following substitutions are available: {MARC} = marc flavour, eg. "MARC21" or "UNIMARC". {FIELD} = field number, eg. "000" or "048". {LANG} = user language, eg. "en" or "fi-FI"', 'free'),
> ('MaxFine',NULL,'','Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.','Integer'),
> ('MaxItemsForBatch','1000',NULL,'Max number of items record to process in a batch (modification or deletion)','Integer'),
> ('maxItemsInSearchResults','20',NULL,'Specify the maximum number of items to display for each result on a page of results','free'),
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 2afac41..f00ade2 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -10663,7 +10663,7 @@ foreach my $file ( sort readdir $dirh ) {
> $DBversion = "3.21.00.XXX";
> if ( CheckVersion($DBversion) ) {
>    $dbh->do("
>-       INSERT INTO systempreferences (variable,value,options,explanation,type)
>+       INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
>        VALUES ('MarcFieldDocURL', NULL, NULL, 'URL used for MARC field documentation. Following substitutions are available: {MARC} = marc flavour, eg. \"MARC21\" or \"UNIMARC\". {FIELD} = field number, eg. \"000\" or \"048\". {LANG} = user language, eg. \"en\" or \"fi-FI\"', 'free');
>     ");
>    print "Upgrade to $DBversion done (Bug 11674: Configuration for MARC field doc URLs)\n";
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>index 47bcc49..8aea9e4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>@@ -140,7 +140,7 @@ function PopupZ3950() {
> }
> 
> function PopupMARCFieldDoc(field) {
>-    [% IF (marcfielddocurl) %]
>+    [% IF Koha.Preference( 'marcfielddocurl' ) %]
>         var docurl = "[% marcfielddocurl.replace('"','&quot;') %]";
>         docurl = docurl.replace("{MARC}", "[% marcflavour %]");
>         docurl = docurl.replace("{FIELD}", ""+field);
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 11674: 26894 | 40432 | 40433 | 40506 | 40515 | 40516 | 40517 | 40519 | 40541 | 40542 | 40605 | 40606 | 40638 | 71108 | 73594 | 74196