@@ -, +, @@
---
C4/Reserves.pm | 64 +++++++++++-----------
circ/pendingreserves.pl | 5 +-
installer/data/mysql/atomicupdate/bug_15516.sql | 16 +++---
installer/data/mysql/kohastructure.sql | 31 ++++++-----
.../prog/en/includes/hold-group-modal.inc | 16 ++++++
.../intranet-tmpl/prog/en/includes/holds_table.inc | 4 +-
.../prog/en/includes/reserve-group-modal.inc | 27 ---------
.../prog/en/modules/circ/circulation.tt | 4 +-
.../prog/en/modules/circ/pendingreserves.tt | 9 +--
.../prog/en/modules/members/moremember.tt | 4 +-
.../reserve/{reserve-group.tt => hold-group.tt} | 18 +++---
.../prog/en/modules/reserve/request.tt | 5 +-
koha-tmpl/intranet-tmpl/prog/js/hold-group.js | 12 ++++
koha-tmpl/intranet-tmpl/prog/js/holds.js | 6 +-
reserve/{reserve-group.pl => hold-group.pl} | 10 ++--
reserve/placerequest.pl | 4 +-
reserve/request.pl | 2 +-
svc/holds | 2 +-
t/db_dependent/Reserves/HoldCount.t | 22 ++++----
19 files changed, 135 insertions(+), 126 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} (50%)
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/hold-group.js
rename reserve/{reserve-group.pl => hold-group.pl} (82%)
--- a/C4/Reserves.pm
+++ a/C4/Reserves.pm
@@ -141,9 +141,9 @@ BEGIN {
GetMaxPatronHoldsForRecord
- &AddReserveGroup
- &DeleteReserveGroup
- &GetReserveGroupReserves
+ &AddHoldGroup
+ &DeleteHoldGroup
+ &GetHoldGroupHolds
);
@EXPORT_OK = qw( MergeHolds );
}
@@ -193,7 +193,7 @@ sub AddReserve {
my $found = $params->{found};
my $itemtype = $params->{itemtype};
my $non_priority = $params->{non_priority};
- my $reserve_group_id = $params->{reserve_group_id};
+ my $hold_group_id = $params->{hold_group_id};
$resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
or output_pref({ dt => dt_from_string, dateonly => 1, dateformat => 'iso' });
@@ -258,7 +258,7 @@ sub AddReserve {
itemtype => $itemtype,
item_level_hold => $checkitem ? 1 : 0,
non_priority => $non_priority ? 1 : 0,
- reserve_group_id => $reserve_group_id,
+ hold_group_id => $hold_group_id,
}
)->store();
$hold->set_waiting() if $found && $found eq 'W';
@@ -623,7 +623,7 @@ sub GetHoldCount {
SELECT COUNT(*) AS counter
FROM reserves
WHERE borrowernumber = ?
- AND reserve_group_id is NULL"; #added by 15516
+ AND hold_group_id is NULL"; #added by 15516
my $sth = $dbh->prepare($query);
$sth->execute($borrowernumber);
my $row = $sth->fetchrow_hashref;
@@ -632,10 +632,10 @@ sub GetHoldCount {
$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);
@@ -1257,14 +1257,14 @@ sub ModReserveAffect {
};
}
- if ($hold->reserve_group_id) {
+ if ($hold->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, $hold->reserve_group_id, $hold->reserve_id);
- DeleteReserveGroup($hold->reserve_group_id);
+ }, undef, $hold->hold_group_id, $hold->reserve_id);
+ DeleteHoldGroup($hold->hold_group_id);
}
_FixPriority( { biblionumber => $biblionumber } );
@@ -2325,54 +2325,54 @@ sub GetMaxPatronHoldsForRecord {
return $max;
}
-=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. Reserves 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 @reserves = GetHoldGroupHolds($hold_group_id);
-Fetch all reserve from a reserve group.
+Fetch all reserve 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;
--- a/circ/pendingreserves.pl
+++ a/circ/pendingreserves.pl
@@ -202,7 +202,7 @@ my $strsth =
ORDER BY items.itemnumber SEPARATOR '|') l_copynumber,
GROUP_CONCAT(DISTINCT items.barcode
ORDER BY items.itemnumber SEPARATOR '|') l_barcode,
- reserves.reserve_group_id,
+ reserves.hold_group_id,
biblio.title,
biblio.copyrightdate,
biblioitems.publicationyear,
@@ -252,6 +252,7 @@ $sth->execute(@query_params);
while ( my $data = $sth->fetchrow_hashref ) {
push(
@reservedata, {
+<<<<<<< HEAD
reservedate => $data->{l_reservedate},
firstname => $data->{firstname} || '',
surname => $data->{surname},
@@ -280,7 +281,7 @@ while ( my $data = $sth->fetchrow_hashref ) {
homebranch => $data->{homebranch},
itemnumber => $data->{itemnumber},
publicationyear => C4::Context->preference('marcflavour') eq "MARC21" ? $data->{copyrightdate} : $data->{publicationyear},
- reserve_group_id => $data->{reserve_group_id},
+ hold_group_id => $data->{hold_group_id},
}
);
}
--- a/installer/data/mysql/atomicupdate/bug_15516.sql
+++ a/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;
--- a/installer/data/mysql/kohastructure.sql
+++ a/installer/data/mysql/kohastructure.sql
@@ -1705,7 +1705,6 @@ CREATE TABLE `old_issues` ( -- lists items that were checked out and have been r
CONSTRAINT `old_issues_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`)
ON DELETE SET NULL ON UPDATE SET NULL,
CONSTRAINT `old_issues_ibfk_borrowers_borrowernumber` FOREIGN KEY (`issuer_id`) REFERENCES `borrowers` (`borrowernumber`),
- CONSTRAINT `old_reserves_ibfk_5` FOREIGN KEY (reserve_group_id) REFERENCES reserve_group (reserve_group_id)
ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1786,6 +1785,16 @@ CREATE TABLE `patronimage` ( -- information related to patron images
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
--
+-- Table structure for table hold_group
+--
+
+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=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+--
-- Table structure for table `reserves`
--
@@ -1814,7 +1823,7 @@ CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha
`itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
`item_level_hold` tinyint(1) NOT NULL DEFAULT 0, -- Is the hpld placed at item level
`non_priority` tinyint(1) NOT NULL DEFAULT 0, -- Is this a non priority hold
- `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`),
@@ -1829,17 +1838,7 @@ CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha
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 (`desk_id`) REFERENCES `desks` (`desk_id`) ON DELETE SET NULL ON UPDATE CASCADE,
- CONSTRAINT `reserves_ibfk_7` FOREIGN KEY (`reserve_group_id`) REFERENCES `reserve_group` (`reserve_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
---
--- Table structure for table reserve_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`)
+ CONSTRAINT `reserves_ibfk_7` FOREIGN KEY (`hold_group_id`) REFERENCES `hold_group` (`hold_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
--
@@ -1871,7 +1870,7 @@ CREATE TABLE `old_reserves` ( -- this table holds all holds/reserves that have b
`itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
`item_level_hold` tinyint(1) NOT NULL DEFAULT 0, -- Is the hpld placed at item level
`non_priority` tinyint(1) NOT NULL DEFAULT 0, -- Is this a non priority hold
- `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`),
@@ -1885,7 +1884,9 @@ CREATE TABLE `old_reserves` ( -- this table holds all holds/reserves that have b
CONSTRAINT `old_reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`)
ON DELETE SET NULL ON UPDATE SET NULL,
CONSTRAINT `old_reserves_ibfk_4` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`)
- ON DELETE SET NULL ON UPDATE SET NULL
+ ON DELETE SET NULL ON UPDATE SET NULL,
+ 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=utf8mb4 COLLATE=utf8mb4_unicode_ci;
--
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc
@@ -0,0 +1,16 @@
+
+
+
+
+
+
Loading
+
+
+
+
+
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
@@ -177,8 +177,8 @@
[% IF hold.non_priority %]
Non priority hold
[% END %]
- [% IF hold.reserve_group_id %]
-
+ [% IF hold.hold_group_id %]
+
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reserve-group-modal.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/reserve-group-modal.inc
@@ -1,27 +0,0 @@
-
-
-
-
Loading
-
-
-
-
-
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -1066,6 +1066,8 @@
+[% INCLUDE 'hold-group-modal.inc' %]
+
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'calendar.inc' %]
[% INCLUDE 'datatables.inc' %]
@@ -1099,6 +1101,7 @@
[% Asset.js("js/checkouts.js") | $raw %]
[% Asset.js("js/holds.js") | $raw %]
[% Asset.js("js/circ-patron-search-results.js") | $raw %]
+ [% Asset.js("js/hold-group.js" | $raw %]
[% END %]
-[%# TODO: this module needs to be separated to html and js part to be included correctly %]
-[% INCLUDE 'reserve-group-modal.inc' %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -907,6 +907,8 @@
+[% INCLUDE 'hold-group-modal.inc' %]
+
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]
[% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
@@ -942,6 +944,7 @@
[% INCLUDE 'str/members-menu.inc' %]
[% Asset.js("js/members-menu.js") | $raw %]
[% Asset.js("js/messaging-preference-form.js") | $raw %]
+ [% Asset.js("js/hold-group.js") %]
[% END %]
-[% INCLUDE 'reserve-group-modal.inc' %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/reserve-group.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/reserve-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 | html %])
[% INCLUDE 'doc-head-close.inc' %]
-
- Holds group ([% reserve_group_id %])
+
+ Holds group ([% hold_group_id | html %])
- [% 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) %]
- [% biblio.title %] |
- [% reserve.priority %] |
- [% reserve.reservenotes %] |
+ [% biblio.title | html %] |
+ [% hold.priority | html %] |
+ [% hold.reservenotes | html %] |
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -983,6 +983,8 @@
+[% INCLUDE 'hold-group-modal.inc' %]
+
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'calendar.inc' %]
@@ -990,6 +992,7 @@
[% Asset.js("lib/hc-sticky.js") | $raw %]
[% Asset.js("js/circ-patron-search-results.js") | $raw %]
[% Asset.js("js/holds.js") | $raw %]
+ [% Asset.js("js/hold-group.js") | $raw %]
[% END %]
-[% INCLUDE 'reserve-group-modal.inc' %]
-
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/js/hold-group.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/hold-group.js
@@ -0,0 +1,12 @@
+$(document).ready(function() {
+ $('body').on('click', 'a.hold-group', function() {
+ var href = $(this).attr('href');
+ $('#hold-group-modal .modal-body').load(href + " #main");
+ $('#hold-group-modal').modal('show');
+ return false;
+ });
+
+ $('#hold-group-modal').on('hidden', function(){
+ $('#hold-group-modal .modal-body').html(' ' + __("Loading") + '
');
+ });
+});
--- a/koha-tmpl/intranet-tmpl/prog/js/holds.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/holds.js
@@ -50,10 +50,10 @@ $(document).ready(function() {
title += " - " + oObj.itemnotes.escapeHtml() + ""
}
- if (oObj.reserve_group_id) {
+ if (oObj.hold_group_id) {
title += '
';
- var link = '' + RESERVE_GROUP +''
- title += '' + PART_OF_A.format(link) + '';
+ var link = '' + __("part of a hold group") +''
+ title += '(' + link + ')';
}
return title;
--- a/reserve/reserve-group.pl
+++ a/reserve/reserve-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;
--- a/reserve/placerequest.pl
+++ a/reserve/placerequest.pl
@@ -77,9 +77,9 @@ my $found;
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 ) {
--- a/reserve/request.pl
+++ a/reserve/request.pl
@@ -690,7 +690,7 @@ foreach my $biblionumber (@biblionumbers) {
$reserve{branchcode} = $res->branchcode();
$reserve{non_priority} = $res->non_priority();
$reserve{object} = $res;
- $reserve{'reserve_group_id'} = $res->reserve_group_id;
+ $reserve{'hold_group_id'} = $res->hold_group_id;
push( @reserveloop, \%reserve );
}
--- a/svc/holds
+++ a/svc/holds
@@ -114,7 +114,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,
reservedate_formatted => $h->reservedate() ? output_pref(
{ dt => dt_from_string( $h->reservedate() ), dateonly => 1 }
)
--- a/t/db_dependent/Reserves/HoldCount.t
+++ a/t/db_dependent/Reserves/HoldCount.t
@@ -50,7 +50,7 @@ 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);
@@ -58,9 +58,9 @@ $biblio->{title}, undef, undef, undef);
is(GetHoldCount($borrowernumber), 1, 'Test borrower has 1 reserve.');
my $reserves_group = $builder->build({
- source => 'ReserveGroup',
+ 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(GetHoldCount($borrowernumber), 2, 'Test borrower has 2 reserve.');
my $reserves_group2 = $builder->build({
- source => 'ReserveGroup',
+ source => 'HoldGroup',
value => {
- reserve_group_id => 2
+ hold_group_id => 2
}
});
-my $reserve_group_id2 = $reserves_group2->{reserve_group_id};
+my $hold_group_id2 = $reserves_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
}
});
--