[% biblio.title %] | -[% reserve.priority %] | -[% reserve.reservenotes %] | +[% biblio.title %] | +[% hold.priority %] | +[% hold.reservenotes %] |
@@ -, +, @@ --- C4/Reserves.pm | 64 +++++++++++----------- installer/data/mysql/atomicupdate/bug_15516.sql | 16 +++--- installer/data/mysql/kohastructure.sql | 18 +++--- .../prog/en/includes/hold-group-modal.inc | 27 +++++++++ .../intranet-tmpl/prog/en/includes/holds_table.inc | 4 +- .../prog/en/includes/reserve-group-modal.inc | 27 --------- .../intranet-tmpl/prog/en/includes/strings.inc | 2 +- .../prog/en/modules/circ/pendingreserves.tt | 6 +- .../prog/en/modules/members/moremember.tt | 2 +- .../reserve/{reserve-group.tt => hold-group.tt} | 18 +++--- .../prog/en/modules/reserve/request.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/holds.js | 4 +- reserve/{reserve-group.pl => hold-group.pl} | 10 ++-- reserve/placerequest.pl | 6 +- svc/holds | 2 +- t/db_dependent/Reserves/ReserveCount.t | 22 ++++---- 16 files changed, 115 insertions(+), 115 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%) rename reserve/{reserve-group.pl => hold-group.pl} (82%) --- a/C4/Reserves.pm +++ a/C4/Reserves.pm @@ -139,9 +139,9 @@ BEGIN { GetMaxPatronHoldsForRecord - &AddReserveGroup - &DeleteReserveGroup - &GetReserveGroupReserves + &AddHoldGroup + &DeleteHoldGroup + &GetHoldGroupHolds ); @EXPORT_OK = qw( MergeHolds ); } @@ -168,7 +168,7 @@ sub AddReserve { $branch, $borrowernumber, $biblionumber, $bibitems, $priority, $resdate, $expdate, $notes, $title, $checkitem, $found, $itemtype, - $reserve_group_id + $hold_group_id ) = @_; $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' }) @@ -216,7 +216,7 @@ sub AddReserve { waitingdate => $waitingdate, expirationdate => $expdate, itemtype => $itemtype, - reserve_group_id => $reserve_group_id, + hold_group_id => $hold_group_id, } )->store(); $hold->set_waiting() if $found eq 'W'; @@ -523,7 +523,7 @@ sub GetReserveCount { 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; @@ -532,10 +532,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); @@ -1103,14 +1103,14 @@ sub ModReserveAffect { $hold->itemnumber($itemnumber); $hold->set_waiting($transferToDo); - 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); } _koha_notify_reserve( $hold->reserve_id ) @@ -2199,54 +2199,54 @@ sub GetHoldRule { return $sth->fetchrow_hashref(); } -=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/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 @@ -1781,7 +1781,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=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -1884,7 +1884,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`), @@ -1897,17 +1897,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=utf8mb4 COLLATE=utf8mb4_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=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- @@ -1935,7 +1935,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`), --- 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,27 @@ +
+ + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -154,8 +154,8 @@ [% END %] [% END %] - [% IF hold.reserve_group_id %] -by [% reserveloo.author | html %]
[% END %] - [% IF reserveloo.reserve_group_id %] -(part of a reserve group)
+ [% IF reserveloo.hold_group_id %] +(part of a hold group)
[% END %] [% ELSE %] @@ -266,5 +266,5 @@ [% END %] [%# TODO: this module needs to be separated to html and js part to be included correctly %] -[% INCLUDE 'reserve-group-modal.inc' %] +[% INCLUDE 'hold-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 @@ -929,5 +929,5 @@ [% END %] -[% INCLUDE 'reserve-group-modal.inc' %] +[% INCLUDE 'hold-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' %] -[% biblio.title %] | -[% reserve.priority %] | -[% reserve.reservenotes %] | +[% biblio.title %] | +[% hold.priority %] | +[% hold.reservenotes %] |