Bugzilla – Attachment 55308 Details for
Bug 15516
Allow to place a hold on first available item from a group of titles
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15516: Reword 'reserve group' to 'hold group'
Bug-15516-Reword-reserve-group-to-hold-group.patch (text/plain), 27.58 KB, created by
Julian Maurice
on 2016-09-07 15:14:03 UTC
(
hide
)
Description:
Bug 15516: Reword 'reserve group' to 'hold group'
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2016-09-07 15:14:03 UTC
Size:
27.58 KB
patch
obsolete
>From 5ffd89f3f54b034398fc9da17f2bd864b4324e5e Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >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 c8f9533..87beff1 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -148,9 +148,9 @@ BEGIN { > > GetMaxPatronHoldsForRecord > >- &AddReserveGroup >- &DeleteReserveGroup >- &GetReserveGroupReserves >+ &AddHoldGroup >+ &DeleteHoldGroup >+ &GetHoldGroupHolds > ); > @EXPORT_OK = qw( MergeHolds ); > } >@@ -176,7 +176,7 @@ sub AddReserve { > $branch, $borrowernumber, $biblionumber, $bibitems, > $priority, $resdate, $expdate, $notes, > $title, $checkitem, $found, $itemtype, >- $reserve_group_id >+ $hold_group_id > ) = @_; > > my $dbh = C4::Context->dbh; >@@ -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(); > >@@ -640,7 +640,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); >@@ -648,10 +648,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); >@@ -1373,14 +1373,14 @@ sub ModReserveAffect { > } > $hold->store(); > >- 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); >+ DeleteReserveGroup($hold->hold_group_id); > } > > _koha_notify_reserve( $itemnumber, $borrowernumber, $biblionumber ) >@@ -1465,7 +1465,7 @@ sub GetReserveInfo { > reminderdate, > priority, > found, >- reserve_group_id, >+ hold_group_id, > firstname, > surname, > phone, >@@ -2578,54 +2578,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. 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 650896e..b3bdd71 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -1767,7 +1767,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; > >@@ -1870,7 +1870,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`), >@@ -1883,17 +1883,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; > > -- >@@ -1921,7 +1921,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 @@ >+<div id="hold-group-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="hold-group-modal-label" aria-hidden="true"> >+ <div class="modal-header"> >+ <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >+ <h3 id="hold-group-modal-label">Hold group</h3> >+ </div> >+ <div class="modal-body"> >+ <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> >+ </div> >+ <div class="modal-footer"> >+ <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+</div> >+ >+<script> >+ $(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('<div id="loading"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> ' + _('Loading') + '</div>'); >+ }); >+ }); >+</script> >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 @@ >-<div id="reserve-group-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="reserve-group-modal-label" aria-hidden="true"> >- <div class="modal-header"> >- <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >- <h3 id="reserve-group-modal-label">Reserve group</h3> >- </div> >- <div class="modal-body"> >- <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> >- </div> >- <div class="modal-footer"> >- <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >- </div> >-</div> >- >-<script> >- $(document).ready(function() { >- $('body').on('click', 'a.reserve-group', function() { >- var href = $(this).attr('href'); >- $('#reserve-group-modal .modal-body').load(href + " #main"); >- $('#reserve-group-modal').modal('show'); >- return false; >- }) >- >- $('#reserve-group-modal').on('hidden', function(){ >- $('#reserve-group-modal .modal-body').html('<div id="loading"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> ' + _('Loading') + '</div>'); >- }); >- }); >-</script> >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"); > //]]> > </script> >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 <span class="ex">[% message | html %]</span> > <p>You have already submitted a barcode, please wait for the checkout to process...</p> > </div> > </div> >-[% 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 ) %] > <p> by [% reserveloo.author %]</p> > [% END %] >- [% IF reserveloo.reserve_group_id %] >- <p>(part of a <a class="reserve-group" href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=[% reserveloo.reserve_group_id %]">reserve group</a>)</p> >+ [% IF reserveloo.hold_group_id %] >+ <p>(part of a <a class="hold-group" href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% reserveloo.hold_group_id %]">hold group</a>)</p> > [% END %] > </td> > [% ELSE %] >@@ -205,5 +205,5 @@ $(document).ready(function() { > </div> > </div> > </div> >-[% 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' %] > </div> > </div> >-[% 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' %] >- <title>Koha › Circulation › Holds › Holds group ([% reserve_group_id %])</title> >+ <title>Koha › Circulation › Holds › Holds group ([% hold_group_id %])</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >-<body id="reserve-reserve-group"> >- <h1>Holds group ([% reserve_group_id %])</h1> >+<body id="reserve-hold-group"> >+ <h1>Holds group ([% hold_group_id %])</h1> > <div id="main"> >- [% IF reserves.size %] >+ [% IF holds.size %] > <table> > <thead> > <tr> >@@ -16,12 +16,12 @@ > </tr> > </thead> > <tbody> >- [% FOREACH reserve IN reserves %] >- [% biblio = Biblio.Get(reserve.biblionumber) %] >+ [% FOREACH hold IN holds %] >+ [% biblio = Biblio.Get(hold.biblionumber) %] > <tr> > <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.title %]</a></td> >- <td>[% reserve.priority %]</td> >- <td>[% reserve.reservenotes %]</td> >+ <td>[% hold.priority %]</td> >+ <td>[% hold.reservenotes %]</td> > </tr> > [% END %] > </tbody> >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 c3e2639..c90642b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -858,8 +858,8 @@ function checkMultiHold() { > <input type="hidden" name="itemnumber" value="" /> > [% END %] > [% END %] >- [% IF reserveloo.reserve_group_id %] >- <div>(part of a <a href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=[% reserveloo.reserve_group_id %]" class="reserve-group">reserve group</a>)</div> >+ [% IF reserveloo.hold_group_id %] >+ <div>(part of a <a href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% reserveloo.hold_group_id %]" class="hold-group">hold group</a>)</div> > [% END %] > </td> > >@@ -924,6 +924,6 @@ function checkMultiHold() { > </div> > </div> > >-[% 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 += " - <span class='" + span_class + "'>" + oObj.itemnotes + "</span>" > } > >- if (oObj.reserve_group_id) { >+ if (oObj.hold_group_id) { > title += '<br>'; >- var link = '<a class="reserve-group" href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=' + oObj.reserve_group_id + '">' + RESERVE_GROUP +'</a>' >+ var link = '<a class="hold-group" href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=' + oObj.hold_group_id + '">' + HOLD_GROUP +'</a>' > title += '<span>' + PART_OF_A.format(link) + '</span>'; > } > >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 c25301a..75478a1 100755 >--- a/reserve/placerequest.pl >+++ b/reserve/placerequest.pl >@@ -84,9 +84,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 > for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) { >diff --git a/reserve/request.pl b/reserve/request.pl >index 66ecdcc..2c8bda6 100755 >--- a/reserve/request.pl >+++ b/reserve/request.pl >@@ -588,7 +588,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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15516
:
46392
|
47498
|
47570
|
47961
|
47962
|
47963
|
48097
|
48098
|
48448
|
48449
|
50094
|
50095
|
50096
|
53742
|
53743
|
53744
|
53770
|
53771
|
53772
|
53774
|
53775
|
53776
|
54977
|
55300
|
55304
|
55305
|
55306
|
55307
|
55308
|
55768
|
55769
|
55770
|
55771
|
55772
|
58799
|
58800
|
58801
|
58802
|
58803
|
59314
|
59315
|
59316
|
59317
|
59318
|
69902
|
69903
|
69904
|
69905
|
69906
|
72485
|
72486
|
72487
|
72488
|
72489
|
72491
|
79077
|
79078
|
79080
|
79081
|
79082
|
79083
|
79213
|
79214
|
79215
|
79216
|
79217
|
79218
|
79219
|
79220
|
79221
|
79222
|
81453
|
81454
|
81455
|
81456
|
81457
|
81458
|
81459
|
81460
|
81461
|
81462
|
81463
|
84554
|
84555
|
84556
|
84557
|
84558
|
84559
|
84560
|
84561
|
84562
|
84563
|
84564
|
87828
|
87829
|
87830
|
87831
|
87832
|
87833
|
87834
|
87835
|
87836
|
87837
|
87838
|
88038
|
88039
|
88125
|
88173
|
88174
|
88175
|
88176
|
88177
|
88178
|
88179
|
88180
|
88181
|
88182
|
88183
|
88184
|
88185
|
88186
|
90289
|
90290
|
90291
|
90292
|
90293
|
90294
|
90295
|
90296
|
90297
|
90298
|
90299
|
90300
|
90301
|
90302
|
90303
|
90829
|
90830
|
90831
|
90832
|
90833
|
90834
|
90835
|
90836
|
90837
|
90838
|
90839
|
90840
|
90841
|
90842
|
90843
|
90844
|
92783
|
92784
|
92785
|
92786
|
92787
|
92788
|
92789
|
92790
|
92791
|
92792
|
92793
|
92794
|
92795
|
92796
|
92797
|
92798
|
114513
|
114514
|
114515
|
114516
|
114517
|
114518
|
114585
|
114586
|
114603
|
114624
|
114625
|
114626
|
114627
|
114628
|
114629
|
114630
|
114631
|
114632
|
114633
|
114634
|
114635
|
114636
|
114637
|
114638
|
114639
|
114640
|
114641
|
114642
|
114643
|
114644
|
114645
|
114647
|
114648
|
114649
|
114650
|
114651
|
114652
|
114653
|
114654
|
114655
|
114656
|
114657
|
114658
|
114659
|
117423
|
117424
|
117425
|
117426
|
118281
|
118282
|
118283
|
118284
|
118285
|
118286
|
118350
|
118351
|
118352
|
118353
|
118354
|
118355
|
120368
|
120369
|
120370
|
120371
|
120372
|
120373
|
120574
|
120643
|
120644
|
120645
|
120646
|
120647
|
120648
|
120649
|
120650
|
120651
|
121523
|
121623
|
122097
|
122102
|
122627
|
128189
|
128190
|
128191
|
128192
|
128193
|
128194
|
128195
|
128196
|
128197
|
128198
|
128199
|
128200
|
128201
|
128202
|
128255
|
128256
|
128257
|
128258
|
128259
|
128260
|
128261
|
128262
|
128263
|
128264
|
128265
|
128266
|
128267
|
128268
|
128269
|
128285
|
128286
|
128287
|
128288
|
128289
|
128290
|
128291
|
128292
|
128293
|
128294
|
128295
|
128296
|
128297
|
128298
|
128299
|
138576
|
138577
|
138578
|
138579
|
138580
|
138581
|
138582
|
138583
|
138584
|
138585
|
138586
|
138587
|
138588
|
138589
|
138593
|
138594
|
138595
|
138596
|
138597
|
138738
|
138739
|
138740
|
138741
|
138742
|
138772
|
138868
|
138869
|
162076
|
162077
|
162078
|
162079
|
162080
|
162081
|
162082
|
162083
|
162084