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

(-)a/installer/data/mysql/atomicupdate/bug_15516.sql (-11 lines)
Lines 1-11 Link Here
1
DROP TABLE IF EXISTS hold_group;
2
CREATE TABLE hold_group (
3
  hold_group_id int unsigned NOT NULL AUTO_INCREMENT,
4
  PRIMARY KEY (hold_group_id)
5
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
6
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 (hold_group_id) REFERENCES hold_group (hold_group_id) ON DELETE SET NULL ON UPDATE CASCADE;
9
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 (hold_group_id) REFERENCES hold_group (hold_group_id) ON DELETE SET NULL ON UPDATE CASCADE;
(-)a/installer/data/mysql/atomicupdate/bug_15516_-_hold_group_table.perl (+15 lines)
Line 0 Link Here
1
$DBversion = 'XXX';
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do(q{DROP TABLE IF EXISTS hold_group});
4
    $dbh->do(q{CREATE TABLE hold_group (
5
        hold_group_id int unsigned NOT NULL AUTO_INCREMENT,
6
        PRIMARY KEY (hold_group_id)
7
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci});
8
    $dbh->do(q{ALTER TABLE reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL});
9
    $dbh->do(q{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});
10
    $dbh->do(q{ALTER TABLE old_reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL});
11
    $dbh->do(q{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});
12
13
    SetVersion( $DBversion );
14
    print "Upgrade to $DBversion done (Bug 15516 - Adding hold group table)\n";
15
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc (-15 / +15 lines)
Lines 1-16 Link Here
1
<div id="hold-group-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="hold-group-modal-label" aria-hidden="true">
1
<div class="modal fade" tabindex="-1" role="dialog" id="hold-group-modal">
2
    <div class="modal-dialog" role="document">
2
  <div class="modal-dialog" role="document">
3
        <div class="modal-content">
3
    <div class="modal-content">
4
            <div class="modal-header">
4
      <div class="modal-header">
5
                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
5
        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
6
                <h3 id="hold-group-modal-label">Reserve group</h3>
6
        <h4 class="modal-title">Hold group</h4>
7
            </div>
7
      </div>
8
            <div class="modal-body">
8
      <div class="modal-body">
9
                <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/loading-small.gif" alt="" /> Loading </div>
9
        <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/loading-small.gif" alt="" /> Loading </div>
10
            </div>
10
      </div>
11
            <div class="modal-footer">
11
      <div class="modal-footer">
12
                <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
12
        <button type="button" class="btn btn-default deny" data-dismiss="modal">Close</button>
13
            </div>
13
      </div>
14
        </div><!-- /.modal-content -->
14
    </div><!-- /.modal-content -->
15
    </div><!-- /.modal-dialog -->
15
  </div><!-- /.modal-dialog -->
16
</div><!-- /.modal -->
16
</div><!-- /.modal -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 991-997 Link Here
991
    [% Asset.js("js/checkouts.js") | $raw %]
991
    [% Asset.js("js/checkouts.js") | $raw %]
992
    [% Asset.js("js/holds.js") | $raw %]
992
    [% Asset.js("js/holds.js") | $raw %]
993
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
993
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
994
    [% Asset.js("js/hold-group.js" | $raw %]
994
    [% Asset.js("js/hold-group.js") | $raw %]
995
    <script type="text/javascript">
995
    <script type="text/javascript">
996
        /* Set some variable needed in circulation.js */
996
        /* Set some variable needed in circulation.js */
997
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
997
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
(-)a/reserve/placerequest.pl (-2 / +1 lines)
Lines 116-122 if ( $type eq 'str8' && $borrower ) { Link Here
116
            if ( $can_override || CanBookBeReserved($borrower->{'borrowernumber'}, $biblionumber)->{status} eq 'OK' ) {
116
            if ( $can_override || CanBookBeReserved($borrower->{'borrowernumber'}, $biblionumber)->{status} eq 'OK' ) {
117
                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,[$biblionumber],
117
                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,[$biblionumber],
118
                           $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found,
118
                           $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found,
119
                           $itemtype, $reserve_group_id);
119
                           $itemtype, $hold_group_id);
120
            }
120
            }
121
        } else {
121
        } else {
122
            # place a request on 1st available
122
            # place a request on 1st available
123
- 

Return to bug 15516