From acff6af37293ba72eafe19fc5519a6f537878375 Mon Sep 17 00:00:00 2001 From: David Gustafsson Date: Wed, 22 May 2019 16:41:27 +0200 Subject: [PATCH] Bug 14957: Fix categorycode module filter value and rename some presets --- cataloguing/addbiblio.pl | 2 +- .../data/mysql/atomicupdate/bug_14957-marc-merge-rules.perl | 2 +- .../intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt | 10 +++++----- tools/batch_record_modification.pl | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index 910a8adec0..d75b533a98 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -835,7 +835,7 @@ if ( $op eq "addbiblio" ) { ModBiblio( $record, $biblionumber, $frameworkcode, { context => { source => $z3950 ? 'z39.50' : 'intranet', - category => $member->{'category_type'}, + categorycode => $member->categorycode, borrower => $loggedinuser } } diff --git a/installer/data/mysql/atomicupdate/bug_14957-marc-merge-rules.perl b/installer/data/mysql/atomicupdate/bug_14957-marc-merge-rules.perl index 535f619c20..cad3474767 100644 --- a/installer/data/mysql/atomicupdate/bug_14957-marc-merge-rules.perl +++ b/installer/data/mysql/atomicupdate/bug_14957-marc-merge-rules.perl @@ -11,7 +11,7 @@ if( CheckVersion( $DBversion ) ) { $dbh->do( $sql ); $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('source', 'source from where modification request was sent', 0);" ); - $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('category', 'categorycode of user who requested modification', 1);" ); + $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('categorycode', 'categorycode of user who requested modification', 1);" ); $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('borrower', 'borrowernumber of user who requested modification', 2);" ); $sql = q{ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt index c4c2c030f2..fd8ab8d845 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt @@ -115,19 +115,19 @@ $(document).ready(function(){ 'remove': 1, 'delete': 1 }, - 'Protect existing': { + 'Add new': { 'add': 1, 'append': 0, 'remove': 0, 'delete': 0 }, - 'Add only': { + 'Add and append': { 'add': 1, 'append': 1, 'remove': 0, 'delete': 0 }, - 'Protect from delete': { + 'Protect from deletion': { 'add': 1, 'append': 1, 'remove': 1, @@ -269,7 +269,7 @@ $(document).ready(function(){ @@ -324,7 +324,7 @@ $(document).ready(function(){ diff --git a/tools/batch_record_modification.pl b/tools/batch_record_modification.pl index 4848c4de52..b6402ae1fc 100755 --- a/tools/batch_record_modification.pl +++ b/tools/batch_record_modification.pl @@ -209,7 +209,7 @@ if ( $op eq 'form' ) { ModBiblio( $record, $biblionumber, $frameworkcode, { source => 'batchmod', - category => $member->{'category_type'}, + categorycode => $member->categorycode, borrower => $loggedinuser } ); -- 2.11.0