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 (+34 lines)
Line 0 Link Here
1
$DBversion = 'XXX';
2
if( CheckVersion( $DBversion ) ) {
3
4
    if( TableExists( 'hold_group' ) ){
5
        $dbh->do(q{UPDATE reserves SET hold_group_id = NULL});
6
        $dbh->do(q{UPDATE old_reserves SET hold_group_id = NULL});
7
8
        $dbh->do(q{ALTER TABLE reserves DROP FOREIGN KEY reserves_ibfk_6});
9
        $dbh->do(q{ALTER TABLE old_reserves DROP FOREIGN KEY old_reserves_ibfk_5});
10
11
        $dbh->do(q{DROP TABLE hold_group});
12
        $dbh->do(q{CREATE TABLE hold_group (
13
            hold_group_id int unsigned NOT NULL AUTO_INCREMENT,
14
            PRIMARY KEY (hold_group_id)
15
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci});
16
    }
17
18
    unless( column_exists( 'reserves', 'hold_group_id' ) ){
19
        $dbh->do(q{ALTER TABLE reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL});
20
    }
21
    unless( column_exists( 'old_reserves', 'hold_group_id') ){
22
        $dbh->do(q{ALTER TABLE old_reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL});
23
    }
24
25
    unless( foreign_key_exists( 'reserves', 'reserves_ibfk_6' ) ){
26
        $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});
27
    }
28
    unless( foreign_key_exists( 'old_reserves', 'old_reserves_ibfk_5' ) ){
29
        $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});
30
    }
31
32
    SetVersion( $DBversion );
33
    print "Upgrade to $DBversion done (Bug 15516 - Adding hold group table)\n";
34
}
(-)a/installer/data/mysql/kohastructure.sql (-1 / +1 lines)
Lines 1885-1891 CREATE TABLE `old_reserves` ( -- this table holds all holds/reserves that have b Link Here
1885
    ON DELETE SET NULL ON UPDATE SET NULL,
1885
    ON DELETE SET NULL ON UPDATE SET NULL,
1886
  CONSTRAINT `old_reserves_ibfk_4` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`)
1886
  CONSTRAINT `old_reserves_ibfk_4` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`)
1887
    ON DELETE SET NULL ON UPDATE SET NULL,
1887
    ON DELETE SET NULL ON UPDATE SET NULL,
1888
  CONSTRAINT `old_reserves_ibfk_5` FOREIGN KEY (hold_group_id) REFERENCES hold_group (hold_group_id)
1888
  CONSTRAINT `old_reserves_ibfk_5` FOREIGN KEY (`hold_group_id`) REFERENCES `hold_group` (`hold_group_id`)
1889
    ON DELETE SET NULL ON UPDATE CASCADE
1889
    ON DELETE SET NULL ON UPDATE CASCADE
1890
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1890
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1891
1891
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc (-3 / +3 lines)
Lines 1-15 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 id="hold-group-modal" class="modal fade" tabindex="-1" role="dialog">
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">Hold group</h3>
6
                <h4 class="modal-title">Hold group</h3>
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 -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 1101-1107 Link Here
1101
    [% Asset.js("js/checkouts.js") | $raw %]
1101
    [% Asset.js("js/checkouts.js") | $raw %]
1102
    [% Asset.js("js/holds.js") | $raw %]
1102
    [% Asset.js("js/holds.js") | $raw %]
1103
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
1103
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
1104
    [% Asset.js("js/hold-group.js" | $raw %]
1104
    [% Asset.js("js/hold-group.js") | $raw %]
1105
    <script>
1105
    <script>
1106
        columns_settings_issues_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
1106
        columns_settings_issues_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
1107
        columns_settings_borrowers_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
1107
        columns_settings_borrowers_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
(-)a/reserve/placerequest.pl (-2 / +1 lines)
Lines 144-150 if ( $type eq 'str8' && $borrower ) { Link Here
144
                        found            => $found,
144
                        found            => $found,
145
                        itemtype         => $itemtype,
145
                        itemtype         => $itemtype,
146
                        non_priority     => $non_priority,
146
                        non_priority     => $non_priority,
147
                        reserve_group_id => $reserve_group_id,
147
                        hold_group_id    => $hold_group_id,
148
                    }
148
                    }
149
                );
149
                );
150
            }
150
            }
151
- 

Return to bug 15516