View | Details | Raw Unified | Return to bug 15516
Collapse All | Expand All

(-)a/C4/Reserves.pm (-32 / +32 lines)
Lines 138-146 BEGIN { Link Here
138
138
139
        GetMaxPatronHoldsForRecord
139
        GetMaxPatronHoldsForRecord
140
140
141
        &AddReserveGroup
141
        &AddHoldGroup
142
        &DeleteReserveGroup
142
        &DeleteHoldGroup
143
        &GetReserveGroupReserves
143
        &GetHoldGroupHolds
144
    );
144
    );
145
    @EXPORT_OK = qw( MergeHolds );
145
    @EXPORT_OK = qw( MergeHolds );
146
}
146
}
Lines 167-173 sub AddReserve { Link Here
167
        $branch,   $borrowernumber, $biblionumber, $bibitems,
167
        $branch,   $borrowernumber, $biblionumber, $bibitems,
168
        $priority, $resdate,        $expdate,      $notes,
168
        $priority, $resdate,        $expdate,      $notes,
169
        $title,    $checkitem,      $found,        $itemtype,
169
        $title,    $checkitem,      $found,        $itemtype,
170
        $reserve_group_id
170
        $hold_group_id
171
    ) = @_;
171
    ) = @_;
172
172
173
    $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
173
    $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
Lines 215-221 sub AddReserve { Link Here
215
            waitingdate    => $waitingdate,
215
            waitingdate    => $waitingdate,
216
            expirationdate => $expdate,
216
            expirationdate => $expdate,
217
            itemtype       => $itemtype,
217
            itemtype       => $itemtype,
218
            reserve_group_id => $reserve_group_id,
218
            hold_group_id => $hold_group_id,
219
        }
219
        }
220
    )->store();
220
    )->store();
221
    $hold->set_waiting() if $found eq 'W';
221
    $hold->set_waiting() if $found eq 'W';
Lines 534-540 sub GetReserveCount { Link Here
534
        SELECT COUNT(*) AS counter
534
        SELECT COUNT(*) AS counter
535
        FROM reserves
535
        FROM reserves
536
        WHERE borrowernumber = ?
536
        WHERE borrowernumber = ?
537
        AND reserve_group_id is NULL"; #added by 15516
537
        AND hold_group_id is NULL"; #added by 15516
538
    my $sth = $dbh->prepare($query);
538
    my $sth = $dbh->prepare($query);
539
    $sth->execute($borrowernumber);
539
    $sth->execute($borrowernumber);
540
    my $row = $sth->fetchrow_hashref;
540
    my $row = $sth->fetchrow_hashref;
Lines 543-552 sub GetReserveCount { Link Here
543
    $count += $row->{counter};
543
    $count += $row->{counter};
544
544
545
    $query = "
545
    $query = "
546
        SELECT COUNT(DISTINCT reserve_group_id) AS counter
546
        SELECT COUNT(DISTINCT hold_group_id) AS counter
547
        FROM reserves
547
        FROM reserves
548
        WHERE borrowernumber = ?
548
        WHERE borrowernumber = ?
549
        AND reserve_group_id is not NULL
549
        AND hold_group_id is not NULL
550
    ";
550
    ";
551
    $sth = $dbh->prepare($query);
551
    $sth = $dbh->prepare($query);
552
    $sth->execute($borrowernumber);
552
    $sth->execute($borrowernumber);
Lines 1124-1137 sub ModReserveAffect { Link Here
1124
    $hold->itemnumber($itemnumber);
1124
    $hold->itemnumber($itemnumber);
1125
    $hold->set_waiting($transferToDo);
1125
    $hold->set_waiting($transferToDo);
1126
1126
1127
    if ($hold->reserve_group_id) {
1127
    if ($hold->hold_group_id) {
1128
        # Delete other reserves from same group
1128
        # Delete other reserves from same group
1129
        $dbh->do(q{
1129
        $dbh->do(q{
1130
            DELETE FROM reserves
1130
            DELETE FROM reserves
1131
            WHERE reserve_group_id = ?
1131
            WHERE hold_group_id = ?
1132
              AND reserve_id != ?
1132
              AND reserve_id != ?
1133
        }, undef, $hold->reserve_group_id, $hold->reserve_id);
1133
        }, undef, $hold->hold_group_id, $hold->reserve_id);
1134
        DeleteReserveGroup($hold->reserve_group_id);
1134
        DeleteHoldGroup($hold->hold_group_id);
1135
    }
1135
    }
1136
1136
1137
    _koha_notify_reserve( $hold->reserve_id )
1137
    _koha_notify_reserve( $hold->reserve_id )
Lines 2228-2281 sub GetHoldRule { Link Here
2228
    return $sth->fetchrow_hashref();
2228
    return $sth->fetchrow_hashref();
2229
}
2229
}
2230
2230
2231
=head2 AddReserveGroup
2231
=head2 AddHoldGroup
2232
2232
2233
    my $reserve_group_id = AddReserveGroup();
2233
    my $hold_group_id = AddHoldGroup();
2234
2234
2235
Creates a new reserve group and returns its ID
2235
Creates a new hold group and returns its ID
2236
2236
2237
=cut
2237
=cut
2238
2238
2239
sub AddReserveGroup {
2239
sub AddHoldGroup {
2240
    my $dbh = C4::Context->dbh;
2240
    my $dbh = C4::Context->dbh;
2241
2241
2242
    $dbh->do('INSERT INTO reserve_group VALUES ()');
2242
    $dbh->do('INSERT INTO hold_group VALUES ()');
2243
    return $dbh->last_insert_id(undef, undef, 'reserve_group', undef);
2243
    return $dbh->last_insert_id(undef, undef, 'hold_group', undef);
2244
}
2244
}
2245
2245
2246
=head2 DeleteReserveGroup
2246
=head2 DeleteHoldGroup
2247
2247
2248
    DeleteReserveGroup($reserve_group_id);
2248
    DeleteHoldGroup($hold_group_id);
2249
2249
2250
Delete a reserve group. Reserves that belong to this group are not removed.
2250
Delete a hold group. Reserves that belong to this group are not removed.
2251
2251
2252
=cut
2252
=cut
2253
2253
2254
sub DeleteReserveGroup {
2254
sub DeleteHoldGroup {
2255
    my ($reserve_group_id) = @_;
2255
    my ($hold_group_id) = @_;
2256
2256
2257
    my $dbh = C4::Context->dbh;
2257
    my $dbh = C4::Context->dbh;
2258
    my $query = 'DELETE FROM reserve_group WHERE reserve_group_id = ?';
2258
    my $query = 'DELETE FROM hold_group WHERE hold_group_id = ?';
2259
    $dbh->do($query, undef, $reserve_group_id);
2259
    $dbh->do($query, undef, $hold_group_id);
2260
}
2260
}
2261
2261
2262
=head2 GetReserveGroupReserves
2262
=head2 GetHoldGroupHolds
2263
2263
2264
    my @reserves = GetReserveGroupReserves($reserve_group_id);
2264
    my @reserves = GetHoldGroupHolds($hold_group_id);
2265
2265
2266
Fetch all reserve from a reserve group.
2266
Fetch all reserve from a hold group.
2267
2267
2268
=cut
2268
=cut
2269
2269
2270
sub GetReserveGroupReserves {
2270
sub GetHoldGroupHolds {
2271
    my ($reserve_group_id) = @_;
2271
    my ($hold_group_id) = @_;
2272
2272
2273
    my $dbh = C4::Context->dbh;
2273
    my $dbh = C4::Context->dbh;
2274
2274
2275
    my $reserves = $dbh->selectall_arrayref(q{
2275
    my $reserves = $dbh->selectall_arrayref(q{
2276
        SELECT * FROM reserves
2276
        SELECT * FROM reserves
2277
        WHERE reserve_group_id = ?
2277
        WHERE hold_group_id = ?
2278
    }, { Slice => {} }, $reserve_group_id);
2278
    }, { Slice => {} }, $hold_group_id);
2279
2279
2280
    return () unless defined $reserves;
2280
    return () unless defined $reserves;
2281
2281
(-)a/installer/data/mysql/atomicupdate/bug_15516.sql (-8 / +8 lines)
Lines 1-11 Link Here
1
DROP TABLE IF EXISTS reserve_group;
1
DROP TABLE IF EXISTS hold_group;
2
CREATE TABLE reserve_group (
2
CREATE TABLE hold_group (
3
  reserve_group_id int unsigned NOT NULL AUTO_INCREMENT,
3
  hold_group_id int unsigned NOT NULL AUTO_INCREMENT,
4
  PRIMARY KEY (reserve_group_id)
4
  PRIMARY KEY (hold_group_id)
5
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
5
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
6
6
7
ALTER TABLE reserves ADD COLUMN reserve_group_id int unsigned NULL DEFAULT NULL;
7
ALTER TABLE reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL;
8
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;
8
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;
9
9
10
ALTER TABLE old_reserves ADD COLUMN reserve_group_id int unsigned NULL DEFAULT NULL;
10
ALTER TABLE old_reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL;
11
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;
11
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 (-9 / +9 lines)
Lines 1777-1783 CREATE TABLE `old_issues` ( -- lists items that were checked out and have been r Link Here
1777
    ON DELETE SET NULL ON UPDATE SET NULL,
1777
    ON DELETE SET NULL ON UPDATE SET NULL,
1778
  CONSTRAINT `old_issues_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`)
1778
  CONSTRAINT `old_issues_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`)
1779
    ON DELETE SET NULL ON UPDATE SET NULL,
1779
    ON DELETE SET NULL ON UPDATE SET NULL,
1780
  CONSTRAINT `old_reserves_ibfk_5` FOREIGN KEY (reserve_group_id) REFERENCES reserve_group (reserve_group_id)
1780
  CONSTRAINT `old_reserves_ibfk_5` FOREIGN KEY (hold_group_id) REFERENCES hold_group (hold_group_id)
1781
    ON DELETE SET NULL ON UPDATE CASCADE
1781
    ON DELETE SET NULL ON UPDATE CASCADE
1782
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1782
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1783
1783
Lines 1881-1887 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1881
  `suspend` BOOLEAN NOT NULL DEFAULT 0,
1881
  `suspend` BOOLEAN NOT NULL DEFAULT 0,
1882
  `suspend_until` DATETIME NULL DEFAULT NULL,
1882
  `suspend_until` DATETIME NULL DEFAULT NULL,
1883
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1883
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1884
  `reserve_group_id` int unsigned NULL DEFAULT NULL,  -- Id used on reservations spanning multiple titles
1884
  `hold_group_id` int unsigned NULL DEFAULT NULL,  -- Id used on reservations spanning multiple titles
1885
  PRIMARY KEY (`reserve_id`),
1885
  PRIMARY KEY (`reserve_id`),
1886
  KEY priorityfoundidx (priority,found),
1886
  KEY priorityfoundidx (priority,found),
1887
  KEY `borrowernumber` (`borrowernumber`),
1887
  KEY `borrowernumber` (`borrowernumber`),
Lines 1894-1910 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1894
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1894
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1895
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1895
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1896
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
1896
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
1897
  CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`reserve_group_id`) REFERENCES `reserve_group` (`reserve_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
1897
  CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`hold_group_id`) REFERENCES `hold_group` (`hold_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
1898
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1898
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1899
1899
1900
--
1900
--
1901
-- Table structure for table reserve_group
1901
-- Table structure for table hold_group
1902
--
1902
--
1903
1903
1904
DROP TABLE IF EXISTS `reserve_group`;
1904
DROP TABLE IF EXISTS `hold_group`;
1905
CREATE TABLE `reserve_group` (
1905
CREATE TABLE `hold_group` (
1906
  `reserve_group_id` int unsigned NOT NULL AUTO_INCREMENT,
1906
  `hold_group_id` int unsigned NOT NULL AUTO_INCREMENT,
1907
  PRIMARY KEY(`reserve_group_id`)
1907
  PRIMARY KEY(`hold_group_id`)
1908
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1908
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1909
1909
1910
--
1910
--
Lines 1932-1938 CREATE TABLE `old_reserves` ( -- this table holds all holds/reserves that have b Link Here
1932
  `suspend` BOOLEAN NOT NULL DEFAULT 0, -- in this hold suspended (1 for yes, 0 for no)
1932
  `suspend` BOOLEAN NOT NULL DEFAULT 0, -- in this hold suspended (1 for yes, 0 for no)
1933
  `suspend_until` DATETIME NULL DEFAULT NULL, -- the date this hold is suspended until (NULL for infinitely)
1933
  `suspend_until` DATETIME NULL DEFAULT NULL, -- the date this hold is suspended until (NULL for infinitely)
1934
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1934
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1935
  `reserve_group_id` int unsigned NULL DEFAULT NULL,  -- The id of a group of titles reservations fulfilled when one title is picked
1935
  `hold_group_id` int unsigned NULL DEFAULT NULL,  -- The id of a group of titles reservations fulfilled when one title is picked
1936
  PRIMARY KEY (`reserve_id`),
1936
  PRIMARY KEY (`reserve_id`),
1937
  KEY `old_reserves_borrowernumber` (`borrowernumber`),
1937
  KEY `old_reserves_borrowernumber` (`borrowernumber`),
1938
  KEY `old_reserves_biblionumber` (`biblionumber`),
1938
  KEY `old_reserves_biblionumber` (`biblionumber`),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc (+27 lines)
Line 0 Link Here
1
<div id="hold-group-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="hold-group-modal-label" aria-hidden="true">
2
    <div class="modal-header">
3
        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
4
        <h3 id="hold-group-modal-label">Reserve group</h3>
5
    </div>
6
    <div class="modal-body">
7
        <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div>
8
    </div>
9
    <div class="modal-footer">
10
        <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
11
    </div>
12
</div>
13
14
<script>
15
  $(document).ready(function() {
16
    $('body').on('click', 'a.hold-group', function() {
17
      var href = $(this).attr('href');
18
      $('#hold-group-modal .modal-body').load(href + " #main");
19
      $('#hold-group-modal').modal('show');
20
      return false;
21
    })
22
23
    $('#hold-group-modal').on('hidden', function(){
24
        $('#hold-group-modal .modal-body').html('<div id="loading"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> ' + _('Loading') + '</div>');
25
    });
26
  });
27
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (-2 / +2 lines)
Lines 158-165 Link Here
158
                        <input type="hidden" name="itemnumber" value="" />
158
                        <input type="hidden" name="itemnumber" value="" />
159
                    [% END %]
159
                    [% END %]
160
                [% END %]
160
                [% END %]
161
                [% IF hold.reserve_group_id %]
161
                [% IF hold.hold_group_id %]
162
                    <div>(part of a <a href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=[% hold.reserve_group_id %]" class="reserve-group">reserve group</a>)</div>
162
                    <div>(part of a <a href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% hold.hold_group_id %]" class="hold-group">hold group</a>)</div>
163
                [% END %]
163
                [% END %]
164
            </td>
164
            </td>
165
165
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/reserve-group-modal.inc (-27 lines)
Lines 1-27 Link Here
1
<div id="reserve-group-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="reserve-group-modal-label" aria-hidden="true">
2
    <div class="modal-header">
3
        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
4
        <h3 id="reserve-group-modal-label">Reserve group</h3>
5
    </div>
6
    <div class="modal-body">
7
        <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div>
8
    </div>
9
    <div class="modal-footer">
10
        <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
11
    </div>
12
</div>
13
14
<script>
15
  $(document).ready(function() {
16
    $('body').on('click', 'a.reserve-group', function() {
17
      var href = $(this).attr('href');
18
      $('#reserve-group-modal .modal-body').load(href + " #main");
19
      $('#reserve-group-modal').modal('show');
20
      return false;
21
    })
22
23
    $('#reserve-group-modal').on('hidden', function(){
24
        $('#reserve-group-modal .modal-body').html('<div id="loading"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> ' + _('Loading') + '</div>');
25
    });
26
  });
27
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (-1 / +1 lines)
Lines 48-53 Link Here
48
    var MSG_NO_ITEMTYPE = _("No itemtype");
48
    var MSG_NO_ITEMTYPE = _("No itemtype");
49
    var MSG_CHECKOUTS_BY_ITEMTYPE = _("Number of checkouts by item type");
49
    var MSG_CHECKOUTS_BY_ITEMTYPE = _("Number of checkouts by item type");
50
    var PART_OF_A = _("(part of a %s)");
50
    var PART_OF_A = _("(part of a %s)");
51
    var RESERVE_GROUP = _("reserve group");
51
    var HOLD_GROUP = _("hold group");
52
//]]>
52
//]]>
53
</script>
53
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-3 / +3 lines)
Lines 79-86 Link Here
79
                [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
79
                [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
80
                [% reserveloo.title | html %] [% FOREACH s IN reserveloo.subtitle %] [% s | html %][% END %]</a></p>
80
                [% reserveloo.title | html %] [% FOREACH s IN reserveloo.subtitle %] [% s | html %][% END %]</a></p>
81
                [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author | html %]</p>[% END %]
81
                [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author | html %]</p>[% END %]
82
                [% IF reserveloo.reserve_group_id %]
82
                [% IF reserveloo.hold_group_id %]
83
                    <p>(part of a <a class="reserve-group" href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=[% reserveloo.reserve_group_id | html %]">reserve group</a>)</p>
83
                    <p>(part of a <a class="hold-group" href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% reserveloo.hold_group_id | html %]">hold group</a>)</p>
84
                [% END %]
84
                [% END %]
85
            </td>
85
            </td>
86
        [% ELSE %]
86
        [% ELSE %]
Lines 307-311 Link Here
307
[% END %]
307
[% END %]
308
308
309
[%# TODO: this module needs to be separated to html and js part to be included correctly %]
309
[%# TODO: this module needs to be separated to html and js part to be included correctly %]
310
[% INCLUDE 'reserve-group-modal.inc' %]
310
[% INCLUDE 'hold-group-modal.inc' %]
311
[% INCLUDE 'intranet-bottom.inc' %]
311
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
Lines 944-948 Link Here
944
    </script>
944
    </script>
945
[% END %]
945
[% END %]
946
946
947
[% INCLUDE 'reserve-group-modal.inc' %]
947
[% INCLUDE 'hold-group-modal.inc' %]
948
[% INCLUDE 'intranet-bottom.inc' %]
948
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/reserve-group.tt (-9 / +9 lines)
Lines 1-12 Link Here
1
[% USE Biblio %]
1
[% USE Biblio %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
  <title>Koha &rsaquo; Circulation &rsaquo; Holds &rsaquo; Holds group ([% reserve_group_id %])</title>
3
  <title>Koha &rsaquo; Circulation &rsaquo; Holds &rsaquo; Holds group ([% hold_group_id %])</title>
4
  [% INCLUDE 'doc-head-close.inc' %]
4
  [% INCLUDE 'doc-head-close.inc' %]
5
</head>
5
</head>
6
<body id="reserve-reserve-group">
6
<body id="hold.hold-group">
7
  <h1>Holds group ([% reserve_group_id %])</h1>
7
  <h1>Holds group ([% hold_group_id %])</h1>
8
  <div id="main">
8
  <div id="main">
9
    [% IF reserves.size %]
9
    [% IF holds.size %]
10
      <table>
10
      <table>
11
        <thead>
11
        <thead>
12
          <tr>
12
          <tr>
Lines 16-27 Link Here
16
          </tr>
16
          </tr>
17
        </thead>
17
        </thead>
18
        <tbody>
18
        <tbody>
19
          [% FOREACH reserve IN reserves %]
19
          [% FOREACH hold IN holds %]
20
            [% biblio = Biblio.Get(reserve.biblionumber) %]
20
            [% biblio = Biblio.Get(hold.biblionumber) %]
21
            <tr>
21
            <tr>
22
              <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.title %]</a></td>
22
              <td><a href="/cgi-bin/koha/hold.request.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.title %]</a></td>
23
              <td>[% reserve.priority %]</td>
23
              <td>[% hold.priority %]</td>
24
              <td>[% reserve.reservenotes %]</td>
24
              <td>[% hold.reservenotes %]</td>
25
            </tr>
25
            </tr>
26
          [% END %]
26
          [% END %]
27
        </tbody>
27
        </tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-1 / +1 lines)
Lines 889-894 Link Here
889
    </script>
889
    </script>
890
[% END %]
890
[% END %]
891
891
892
[% INCLUDE 'reserve-group-modal.inc' %]
892
[% INCLUDE 'hold-group-modal.inc' %]
893
893
894
[% INCLUDE 'intranet-bottom.inc' %]
894
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/holds.js (-2 / +2 lines)
Lines 42-50 $(document).ready(function() { Link Here
42
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes.escapeHtml() + "</span>"
42
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes.escapeHtml() + "</span>"
43
                            }
43
                            }
44
44
45
                            if (oObj.reserve_group_id) {
45
                            if (oObj.hold_group_id) {
46
                              title += '<br>';
46
                              title += '<br>';
47
                              var link = '<a class="reserve-group" href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=' + oObj.reserve_group_id + '">' + RESERVE_GROUP +'</a>'
47
                              var link = '<a class="hold-group" href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=' + oObj.hold_group_id + '">' + HOLD_GROUP +'</a>'
48
                              title += '<span>' + PART_OF_A.format(link) + '</span>';
48
                              title += '<span>' + PART_OF_A.format(link) + '</span>';
49
                            }
49
                            }
50
50
(-)a/reserve/reserve-group.pl (-5 / +5 lines)
Lines 24-42 use C4::Reserves; Link Here
24
24
25
my $cgi = new CGI;
25
my $cgi = new CGI;
26
my ($template, $loggedinuser, $cookie) = get_template_and_user({
26
my ($template, $loggedinuser, $cookie) = get_template_and_user({
27
    template_name   => "reserve/reserve-group.tt",
27
    template_name   => "reserve/hold-group.tt",
28
    query           => $cgi,
28
    query           => $cgi,
29
    type            => "intranet",
29
    type            => "intranet",
30
    authnotrequired => 0,
30
    authnotrequired => 0,
31
    flagsrequired   => { circulate => 'circulate_remaining_permissions' },
31
    flagsrequired   => { circulate => 'circulate_remaining_permissions' },
32
});
32
});
33
33
34
my $reserve_group_id = $cgi->param('reserve_group_id');
34
my $hold_group_id = $cgi->param('hold_group_id');
35
my @reserves = GetReserveGroupReserves($reserve_group_id);
35
my @reserves = GetHoldGroupHolds($hold_group_id);
36
36
37
$template->param(
37
$template->param(
38
    reserve_group_id => $reserve_group_id,
38
    hold_group_id => $hold_group_id,
39
    reserves => \@reserves,
39
    holds => \@holds,
40
);
40
);
41
41
42
output_html_with_http_headers $cgi, $cookie, $template->output;
42
output_html_with_http_headers $cgi, $cookie, $template->output;
(-)a/reserve/placerequest.pl (-2 / +2 lines)
Lines 75-83 my $found; Link Here
75
75
76
if ( $type eq 'str8' && $borrower ) {
76
if ( $type eq 'str8' && $borrower ) {
77
77
78
    my $reserve_group_id;
78
    my $hold_group_id;
79
    if ($multi_hold && $requestany) {
79
    if ($multi_hold && $requestany) {
80
        $reserve_group_id = AddReserveGroup();
80
        $hold_group_id = AddReserveGroup();
81
    }
81
    }
82
82
83
    foreach my $biblionumber ( keys %bibinfos ) {
83
    foreach my $biblionumber ( keys %bibinfos ) {
(-)a/svc/holds (-1 / +1 lines)
Lines 102-108 while ( my $h = $holds_rs->next() ) { Link Here
102
        waiting_here   => $h->branch()->branchcode() eq $branch,
102
        waiting_here   => $h->branch()->branchcode() eq $branch,
103
        priority       => $h->priority(),
103
        priority       => $h->priority(),
104
        itemtype_limit => $itemtype_limit,
104
        itemtype_limit => $itemtype_limit,
105
        reserve_group_id => $h->reserve_group_id,
105
        hold_group_id => $h->hold_group_id,
106
        subtitle       => GetRecordValue(
106
        subtitle       => GetRecordValue(
107
            'subtitle',
107
            'subtitle',
108
            GetMarcBiblio({ biblionumber => $biblionumber }),
108
            GetMarcBiblio({ biblionumber => $biblionumber }),
(-)a/t/db_dependent/Reserves/ReserveCount.t (-12 / +11 lines)
Lines 50-56 my $biblio = $builder->build( { source => 'Biblio', } ); Link Here
50
my $biblionumber = $biblio->{biblionumber};
50
my $biblionumber = $biblio->{biblionumber};
51
51
52
# Use AddReserve instead of TestBuilder because i don't manage
52
# Use AddReserve instead of TestBuilder because i don't manage
53
# to make TestBuilder set reserve_group_id to null. Idea ?
53
# to make TestBuilder set hold_group_id to null. Idea ?
54
my $reserve_id = AddReserve($branchcode, $borrowernumber,
54
my $reserve_id = AddReserve($branchcode, $borrowernumber,
55
$biblionumber, $biblionumber, 1, undef, undef, undef
55
$biblionumber, $biblionumber, 1, undef, undef, undef
56
$biblio->{title}, undef, undef, undef);
56
$biblio->{title}, undef, undef, undef);
Lines 58-66 $biblio->{title}, undef, undef, undef); Link Here
58
is(GetReserveCount($borrowernumber), 1, 'Test borrower has 1 reserve.');
58
is(GetReserveCount($borrowernumber), 1, 'Test borrower has 1 reserve.');
59
59
60
my $reserves_group = $builder->build({
60
my $reserves_group = $builder->build({
61
    source => 'ReserveGroup',
61
    source => 'HoldGroup',
62
    value => {
62
    value => {
63
        reserve_group_id => 1
63
        hold_group_id => 1
64
    }
64
    }
65
});
65
});
66
66
Lines 68-113 my $reserve2 = $builder->build({ Link Here
68
    source => 'Reserve',
68
    source => 'Reserve',
69
    value => {
69
    value => {
70
        borrowernumber => $borrowernumber,
70
        borrowernumber => $borrowernumber,
71
        reserve_group_id => 1
71
        hold_group_id => 1
72
    }
72
    }
73
});
73
});
74
my $reserve3 = $builder->build({
74
my $reserve3 = $builder->build({
75
    source => 'Reserve',
75
    source => 'Reserve',
76
    value => {
76
    value => {
77
        borrowernumber => $borrowernumber,
77
        borrowernumber => $borrowernumber,
78
        reserve_group_id => 1
78
        hold_group_id => 1
79
    }
79
    }
80
});
80
});
81
81
82
is(GetReserveCount($borrowernumber), 2, 'Test borrower has 2 reserve.');
82
is(GetReserveCount($borrowernumber), 2, 'Test borrower has 2 reserve.');
83
83
84
my $reserves_group2 = $builder->build({
84
my $reserves_group2 = $builder->build({
85
    source => 'ReserveGroup',
85
    source => 'HoldGroup',
86
    value => {
86
    value => {
87
        reserve_group_id => 2
87
        hold_group_id => 2
88
    }
88
    }
89
});
89
});
90
my $reserve_group_id2 = $reserves_group2->{reserve_group_id};
90
my $hold_group_id2 = $reserves_group2->{hold_group_id};
91
91
92
my $reserve4 = $builder->build({
92
my $reserve4 = $builder->build({
93
    source => 'Reserve',
93
    source => 'Reserve',
94
    value => {
94
    value => {
95
        borrowernumber => $borrowernumber,
95
        borrowernumber => $borrowernumber,
96
        reserve_group_id => 2
96
        hold_group_id => 2
97
    }
97
    }
98
});
98
});
99
my $reserve5 = $builder->build({
99
my $reserve5 = $builder->build({
100
    source => 'Reserve',
100
    source => 'Reserve',
101
    value => {
101
    value => {
102
        borrowernumber => $borrowernumber,
102
        borrowernumber => $borrowernumber,
103
        reserve_group_id => 2
103
        hold_group_id => 2
104
    }
104
    }
105
});
105
});
106
my $reserve6 = $builder->build({
106
my $reserve6 = $builder->build({
107
    source => 'Reserve',
107
    source => 'Reserve',
108
    value => {
108
    value => {
109
        borrowernumber => $borrowernumber,
109
        borrowernumber => $borrowernumber,
110
        reserve_group_id => 2
110
        hold_group_id => 2
111
    }
111
    }
112
});
112
});
113
113
114
- 

Return to bug 15516