From e5baf270252ca55cc3871e2ca58c652d40187252 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Wed, 7 Sep 2016 15:45:16 +0200 Subject: [PATCH] Bug 15516: Reword 'reserve group' to 'hold group' --- C4/Reserves.pm | 66 +++++++++++----------- circ/pendingreserves.pl | 4 +- installer/data/mysql/atomicupdate/bug_15516.sql | 16 +++--- installer/data/mysql/kohastructure.sql | 18 +++--- .../prog/en/includes/hold-group-modal.inc | 27 +++++++++ .../prog/en/includes/reserve-group-modal.inc | 27 --------- .../intranet-tmpl/prog/en/includes/strings.inc | 2 +- .../prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/circ/pendingreserves.tt | 6 +- .../prog/en/modules/members/moremember.tt | 2 +- .../reserve/{reserve-group.tt => hold-group.tt} | 16 +++--- .../prog/en/modules/reserve/request.tt | 6 +- koha-tmpl/intranet-tmpl/prog/js/holds.js | 4 +- reserve/{reserve-group.pl => hold-group.pl} | 10 ++-- reserve/placerequest.pl | 6 +- reserve/request.pl | 2 +- svc/holds | 2 +- t/db_dependent/Reserves/ReserveCount.t | 26 ++++----- 18 files changed, 121 insertions(+), 121 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/reserve-group-modal.inc rename koha-tmpl/intranet-tmpl/prog/en/modules/reserve/{reserve-group.tt => hold-group.tt} (64%) rename reserve/{reserve-group.pl => hold-group.pl} (82%) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index e1bff13..e0e150a 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -144,9 +144,9 @@ BEGIN { IsItemOnHoldAndFound - &AddReserveGroup - &DeleteReserveGroup - &GetReserveGroupReserves + &AddHoldGroup + &DeleteHoldGroup + &GetHoldGroupReserves ); @EXPORT_OK = qw( MergeHolds ); } @@ -172,7 +172,7 @@ sub AddReserve { $branch, $borrowernumber, $biblionumber, $bibitems, $priority, $resdate, $expdate, $notes, $title, $checkitem, $found, $itemtype, - $reserve_group_id + $hold_group_id ) = @_; if ( Koha::Holds->search( { borrowernumber => $borrowernumber, biblionumber => $biblionumber } )->count() > 0 ) { @@ -217,7 +217,7 @@ sub AddReserve { waitingdate => $waitingdate, expirationdate => $expdate, itemtype => $itemtype, - reserve_group_id => $reserve_group_id, + hold_group_id => $hold_group_id, } )->store(); @@ -630,7 +630,7 @@ sub GetReserveCount { SELECT COUNT(*) AS counter FROM reserves WHERE borrowernumber = ? - AND reserve_group_id is NULL + AND hold_group_id is NULL "; my $sth = $dbh->prepare($query); $sth->execute($borrowernumber); @@ -638,10 +638,10 @@ sub GetReserveCount { $count += $row->{counter}; $query = " - SELECT COUNT(DISTINCT reserve_group_id) AS counter + SELECT COUNT(DISTINCT hold_group_id) AS counter FROM reserves WHERE borrowernumber = ? - AND reserve_group_id is not NULL + AND hold_group_id is not NULL "; $sth = $dbh->prepare($query); $sth->execute($borrowernumber); @@ -1384,14 +1384,14 @@ sub ModReserveAffect { $sth = $dbh->prepare($query); $sth->execute( $itemnumber, $borrowernumber,$biblionumber); - if ($request->{reserve_group_id}) { + if ($request->{hold_group_id}) { # Delete other reserves from same group $dbh->do(q{ DELETE FROM reserves - WHERE reserve_group_id = ? + WHERE hold_group_id = ? AND reserve_id != ? - }, undef, $request->{reserve_group_id}, $request->{reserve_id}); - DeleteReserveGroup($request->{reserve_group_id}); + }, undef, $request->{hold_group_id}, $request->{reserve_id}); + DeleteHoldGroup($request->{hold_group_id}); } _koha_notify_reserve( $itemnumber, $borrowernumber, $biblionumber ) if ( !$transferToDo && !$already_on_shelf ); @@ -1473,7 +1473,7 @@ sub GetReserveInfo { reminderdate, priority, found, - reserve_group_id, + hold_group_id, firstname, surname, phone, @@ -2529,54 +2529,54 @@ sub IsItemOnHoldAndFound { return $found; } -=head2 AddReserveGroup +=head2 AddHoldGroup - my $reserve_group_id = AddReserveGroup(); + my $hold_group_id = AddHoldGroup(); -Creates a new reserve group and returns its ID +Creates a new hold group and returns its ID =cut -sub AddReserveGroup { +sub AddHoldGroup { my $dbh = C4::Context->dbh; - $dbh->do('INSERT INTO reserve_group VALUES ()'); - return $dbh->last_insert_id(undef, undef, 'reserve_group', undef); + $dbh->do('INSERT INTO hold_group VALUES ()'); + return $dbh->last_insert_id(undef, undef, 'hold_group', undef); } -=head2 DeleteReserveGroup +=head2 DeleteHoldGroup - DeleteReserveGroup($reserve_group_id); + DeleteHoldGroup($hold_group_id); -Delete a reserve group. Reserves that belong to this group are not removed. +Delete a hold group. Holds that belong to this group are not removed. =cut -sub DeleteReserveGroup { - my ($reserve_group_id) = @_; +sub DeleteHoldGroup { + my ($hold_group_id) = @_; my $dbh = C4::Context->dbh; - my $query = 'DELETE FROM reserve_group WHERE reserve_group_id = ?'; - $dbh->do($query, undef, $reserve_group_id); + my $query = 'DELETE FROM hold_group WHERE hold_group_id = ?'; + $dbh->do($query, undef, $hold_group_id); } -=head2 GetReserveGroupReserves +=head2 GetHoldGroupHolds - my @reserves = GetReserveGroupReserves($reserve_group_id); + my @holds = GetHoldGroupHolds($hold_group_id); -Fetch all reserve from a reserve group. +Fetch all holds from a hold group. =cut -sub GetReserveGroupReserves { - my ($reserve_group_id) = @_; +sub GetHoldGroupHolds { + my ($hold_group_id) = @_; my $dbh = C4::Context->dbh; my $reserves = $dbh->selectall_arrayref(q{ SELECT * FROM reserves - WHERE reserve_group_id = ? - }, { Slice => {} }, $reserve_group_id); + WHERE hold_group_id = ? + }, { Slice => {} }, $hold_group_id); return () unless defined $reserves; diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index ea1de90..0e5b8a9 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -118,7 +118,7 @@ if ( $run_report ) { reminderdate, max(priority) as priority, reserves.found, - reserves.reserve_group_id, + reserves.hold_group_id, biblio.title, biblio.author, count(DISTINCT items.itemnumber) as icount, @@ -168,7 +168,7 @@ if ( $run_report ) { biblionumber => $data->{biblionumber}, statusw => ( $data->{found} eq "W" ), statusf => ( $data->{found} eq "F" ), - reserve_group_id => $data->{reserve_group_id}, + hold_group_id => $data->{hold_group_id}, holdingbranches => [split('\|', $data->{l_holdingbranch})], branch => $data->{l_branch}, itemcallnumber => $data->{l_itemcallnumber}, diff --git a/installer/data/mysql/atomicupdate/bug_15516.sql b/installer/data/mysql/atomicupdate/bug_15516.sql index cad3cc5..bc2c059 100644 --- a/installer/data/mysql/atomicupdate/bug_15516.sql +++ b/installer/data/mysql/atomicupdate/bug_15516.sql @@ -1,11 +1,11 @@ -DROP TABLE IF EXISTS reserve_group; -CREATE TABLE reserve_group ( - reserve_group_id int unsigned NOT NULL AUTO_INCREMENT, - PRIMARY KEY (reserve_group_id) +DROP TABLE IF EXISTS hold_group; +CREATE TABLE hold_group ( + hold_group_id int unsigned NOT NULL AUTO_INCREMENT, + PRIMARY KEY (hold_group_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -ALTER TABLE reserves ADD COLUMN reserve_group_id int unsigned NULL DEFAULT NULL; -ALTER TABLE reserves ADD CONSTRAINT reserves_ibfk_6 FOREIGN KEY (reserve_group_id) REFERENCES reserve_group (reserve_group_id) ON DELETE SET NULL ON UPDATE CASCADE; +ALTER TABLE reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL; +ALTER TABLE reserves ADD CONSTRAINT reserves_ibfk_6 FOREIGN KEY (hold_group_id) REFERENCES hold_group (hold_group_id) ON DELETE SET NULL ON UPDATE CASCADE; -ALTER TABLE old_reserves ADD COLUMN reserve_group_id int unsigned NULL DEFAULT NULL; -ALTER TABLE old_reserves ADD CONSTRAINT old_reserves_ibfk_5 FOREIGN KEY (reserve_group_id) REFERENCES reserve_group (reserve_group_id) ON DELETE SET NULL ON UPDATE CASCADE; +ALTER TABLE old_reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL; +ALTER TABLE old_reserves ADD CONSTRAINT old_reserves_ibfk_5 FOREIGN KEY (hold_group_id) REFERENCES hold_group (hold_group_id) ON DELETE SET NULL ON UPDATE CASCADE; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 74824bd..339f346 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1766,7 +1766,7 @@ CREATE TABLE `old_issues` ( -- lists items that were checked out and have been r ON DELETE SET NULL ON UPDATE SET NULL, CONSTRAINT `old_issues_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE SET NULL ON UPDATE SET NULL - CONSTRAINT `old_reserves_ibfk_5` FOREIGN KEY (reserve_group_id) REFERENCES reserve_group (reserve_group_id) + CONSTRAINT `old_reserves_ibfk_5` FOREIGN KEY (hold_group_id) REFERENCES hold_group (hold_group_id) ON DELETE SET NULL ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; @@ -1869,7 +1869,7 @@ CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha `suspend` BOOLEAN NOT NULL DEFAULT 0, `suspend_until` DATETIME NULL DEFAULT NULL, `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting - `reserve_group_id` int unsigned NULL DEFAULT NULL, -- Id used on reservations spanning multiple titles + `hold_group_id` int unsigned NULL DEFAULT NULL, -- Id used on reservations spanning multiple titles PRIMARY KEY (`reserve_id`), KEY priorityfoundidx (priority,found), KEY `borrowernumber` (`borrowernumber`), @@ -1882,17 +1882,17 @@ CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`reserve_group_id`) REFERENCES `reserve_group` (`reserve_group_id`) ON DELETE SET NULL ON UPDATE CASCADE + CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`hold_group_id`) REFERENCES `hold_group` (`hold_group_id`) ON DELETE SET NULL ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- --- Table structure for table reserve_group +-- Table structure for table hold_group -- -DROP TABLE IF EXISTS `reserve_group`; -CREATE TABLE `reserve_group` ( - `reserve_group_id` int unsigned NOT NULL AUTO_INCREMENT, - PRIMARY KEY(`reserve_group_id`) +DROP TABLE IF EXISTS `hold_group`; +CREATE TABLE `hold_group` ( + `hold_group_id` int unsigned NOT NULL AUTO_INCREMENT, + PRIMARY KEY(`hold_group_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- @@ -1920,7 +1920,7 @@ CREATE TABLE `old_reserves` ( -- this table holds all holds/reserves that have b `suspend` BOOLEAN NOT NULL DEFAULT 0, -- in this hold suspended (1 for yes, 0 for no) `suspend_until` DATETIME NULL DEFAULT NULL, -- the date this hold is suspended until (NULL for infinitely) `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting - `reserve_group_id` int unsigned NULL DEFAULT NULL, -- The id of a group of titles reservations fulfilled when one title is picked + `hold_group_id` int unsigned NULL DEFAULT NULL, -- The id of a group of titles reservations fulfilled when one title is picked PRIMARY KEY (`reserve_id`), KEY `old_reserves_borrowernumber` (`borrowernumber`), KEY `old_reserves_biblionumber` (`biblionumber`), diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc new file mode 100644 index 0000000..1b0f28a --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc @@ -0,0 +1,27 @@ + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reserve-group-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reserve-group-modal.inc deleted file mode 100644 index 2a3e68b..0000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reserve-group-modal.inc +++ /dev/null @@ -1,27 +0,0 @@ - - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc index 45d33be..efb2c53 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc @@ -40,6 +40,6 @@ var SUSPEND_HOLD_ERROR_NOT_FOUND = _("Unable to suspend hold, hold not found"); var RESUME_HOLD_ERROR_NOT_FOUND = _("Unable to resume, hold not found"); var PART_OF_A = _("(part of a %s)"); - var RESERVE_GROUP = _("reserve group"); + var HOLD_GROUP = _("hold group"); //]]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 36e7f7c..e6e26d6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -988,5 +988,5 @@ No patron matched [% message | html %]

You have already submitted a barcode, please wait for the checkout to process...

-[% INCLUDE 'reserve-group-modal.inc' %] +[% INCLUDE 'hold-group-modal.inc' %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt index f1dd087..7fe00df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -119,8 +119,8 @@ $(document).ready(function() { [% IF ( reserveloo.author ) %]

by [% reserveloo.author %]

[% END %] - [% IF reserveloo.reserve_group_id %] -

(part of a reserve group)

+ [% IF reserveloo.hold_group_id %] +

(part of a hold group)

[% END %] [% ELSE %] @@ -205,5 +205,5 @@ $(document).ready(function() { -[% INCLUDE 'reserve-group-modal.inc' %] +[% INCLUDE 'hold-group-modal.inc' %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 89a2d68..030a8e7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -581,5 +581,5 @@ function validate1(date) { [% INCLUDE 'circ-menu.inc' %] -[% INCLUDE 'reserve-group-modal.inc' %] +[% INCLUDE 'hold-group-modal.inc' %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/reserve-group.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/hold-group.tt similarity index 64% rename from koha-tmpl/intranet-tmpl/prog/en/modules/reserve/reserve-group.tt rename to koha-tmpl/intranet-tmpl/prog/en/modules/reserve/hold-group.tt index 8926c0a..1ee44d3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/reserve-group.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/hold-group.tt @@ -1,12 +1,12 @@ [% USE Biblio %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Circulation › Holds › Holds group ([% reserve_group_id %]) + Koha › Circulation › Holds › Holds group ([% hold_group_id %]) [% INCLUDE 'doc-head-close.inc' %] - -

Holds group ([% reserve_group_id %])

+ +

Holds group ([% hold_group_id %])

- [% IF reserves.size %] + [% IF holds.size %] @@ -16,12 +16,12 @@ - [% FOREACH reserve IN reserves %] - [% biblio = Biblio.Get(reserve.biblionumber) %] + [% FOREACH hold IN holds %] + [% biblio = Biblio.Get(hold.biblionumber) %] - - + + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index ef2db07..bb0cd44 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -785,8 +785,8 @@ function checkMultiHold() { [% END %] [% END %] - [% IF reserveloo.reserve_group_id %] -
(part of a reserve group)
+ [% IF reserveloo.hold_group_id %] +
(part of a hold group)
[% END %] @@ -851,6 +851,6 @@ function checkMultiHold() { -[% INCLUDE 'reserve-group-modal.inc' %] +[% INCLUDE 'hold-group-modal.inc' %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js index 90af616..d305b78 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/holds.js +++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js @@ -42,9 +42,9 @@ $(document).ready(function() { title += " - " + oObj.itemnotes + "" } - if (oObj.reserve_group_id) { + if (oObj.hold_group_id) { title += '
'; - var link = '' + RESERVE_GROUP +'' + var link = '' + HOLD_GROUP +'' title += '' + PART_OF_A.format(link) + ''; } diff --git a/reserve/reserve-group.pl b/reserve/hold-group.pl similarity index 82% rename from reserve/reserve-group.pl rename to reserve/hold-group.pl index 91ed958..49d33e4 100755 --- a/reserve/reserve-group.pl +++ b/reserve/hold-group.pl @@ -24,19 +24,19 @@ use C4::Reserves; my $cgi = new CGI; my ($template, $loggedinuser, $cookie) = get_template_and_user({ - template_name => "reserve/reserve-group.tt", + template_name => "reserve/hold-group.tt", query => $cgi, type => "intranet", authnotrequired => 0, flagsrequired => { circulate => 'circulate_remaining_permissions' }, }); -my $reserve_group_id = $cgi->param('reserve_group_id'); -my @reserves = GetReserveGroupReserves($reserve_group_id); +my $hold_group_id = $cgi->param('hold_group_id'); +my @holds = GetHoldGroupHolds($hold_group_id); $template->param( - reserve_group_id => $reserve_group_id, - reserves => \@reserves, + hold_group_id => $hold_group_id, + holds => \@holds, ); output_html_with_http_headers $cgi, $cookie, $template->output; diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl index 6c78b09..1576832 100755 --- a/reserve/placerequest.pl +++ b/reserve/placerequest.pl @@ -82,9 +82,9 @@ if (defined $checkitem && $checkitem ne ''){ if ($type eq 'str8' && $borrower){ - my $reserve_group_id; + my $hold_group_id; if ($multi_hold && $requestany) { - $reserve_group_id = AddReserveGroup(); + $hold_group_id = AddHoldGroup(); } foreach my $biblionumber (keys %bibinfos) { @@ -115,7 +115,7 @@ if ($type eq 'str8' && $borrower){ AddReserve($branch, $borrower->{'borrowernumber'}, $biblionumber, [$biblionumber], $bibinfo->{rank}, $startdate, $expirationdate, $notes, $bibinfo->{title}, $checkitem, $found, $itemtype, - $reserve_group_id); + $hold_group_id); } else { # place a request on 1st available AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found, $itemtype); diff --git a/reserve/request.pl b/reserve/request.pl index 9f4eeb8..b881a46 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -569,7 +569,7 @@ foreach my $biblionumber (@biblionumbers) { $reserve{'suspend_until'} = $res->suspend_until(); $reserve{'reserve_id'} = $res->reserve_id(); $reserve{itemtype} = $res->itemtype(); - $reserve{'reserve_group_id'} = $res->reserve_group_id; + $reserve{'hold_group_id'} = $res->hold_group_id; if ( C4::Context->preference('IndependentBranches') && $flags->{'superlibrarian'} != 1 ) { $reserve{'branchloop'} = [ Koha::Libraries->find( $res->branchcode() ) ]; diff --git a/svc/holds b/svc/holds index 095a9cb..30372b1 100755 --- a/svc/holds +++ b/svc/holds @@ -96,7 +96,7 @@ while ( my $h = $holds_rs->next() ) { waiting_here => $h->branch()->branchcode() eq $branch, priority => $h->priority(), itemtype_limit => $itemtype_limit, - reserve_group_id => $h->reserve_group_id, + hold_group_id => $h->hold_group_id, subtitle => GetRecordValue( 'subtitle', GetMarcBiblio($biblionumber), GetFrameworkCode($biblionumber) diff --git a/t/db_dependent/Reserves/ReserveCount.t b/t/db_dependent/Reserves/ReserveCount.t index f5724a0..a9fe9dc 100644 --- a/t/db_dependent/Reserves/ReserveCount.t +++ b/t/db_dependent/Reserves/ReserveCount.t @@ -50,17 +50,17 @@ my $biblio = $builder->build( { source => 'Biblio', } ); my $biblionumber = $biblio->{biblionumber}; # Use AddReserve instead of TestBuilder because i don't manage -# to make TestBuilder set reserve_group_id to null. Idea ? +# to make TestBuilder set hold_group_id to null. Idea ? my $reserve_id = AddReserve($branchcode, $borrowernumber, $biblionumber, $biblionumber, 1, undef, undef, undef $biblio->{title}, undef, undef, undef); is(GetReserveCount($borrowernumber), 1, 'Test borrower has 1 reserve.'); -my $reserves_group = $builder->build({ - source => 'ReserveGroup', +my $holds_group = $builder->build({ + source => 'HoldGroup', value => { - reserve_group_id => 1 + hold_group_id => 1 } }); @@ -68,46 +68,46 @@ my $reserve2 = $builder->build({ source => 'Reserve', value => { borrowernumber => $borrowernumber, - reserve_group_id => 1 + hold_group_id => 1 } }); my $reserve3 = $builder->build({ source => 'Reserve', value => { borrowernumber => $borrowernumber, - reserve_group_id => 1 + hold_group_id => 1 } }); is(GetReserveCount($borrowernumber), 2, 'Test borrower has 2 reserve.'); -my $reserves_group2 = $builder->build({ - source => 'ReserveGroup', +my $holds_group2 = $builder->build({ + source => 'HoldGroup', value => { - reserve_group_id => 2 + hold_group_id => 2 } }); -my $reserve_group_id2 = $reserves_group2->{reserve_group_id}; +my $hold_group_id2 = $holds_group2->{hold_group_id}; my $reserve4 = $builder->build({ source => 'Reserve', value => { borrowernumber => $borrowernumber, - reserve_group_id => 2 + hold_group_id => 2 } }); my $reserve5 = $builder->build({ source => 'Reserve', value => { borrowernumber => $borrowernumber, - reserve_group_id => 2 + hold_group_id => 2 } }); my $reserve6 = $builder->build({ source => 'Reserve', value => { borrowernumber => $borrowernumber, - reserve_group_id => 2 + hold_group_id => 2 } }); -- 2.1.4
[% biblio.title %][% reserve.priority %][% reserve.reservenotes %][% hold.priority %][% hold.reservenotes %]