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

(-)a/installer/data/mysql/updatedatabase.pl (-1 / +1 lines)
Lines 7947-7953 if (CheckVersion($DBversion)) { Link Here
7947
7947
7948
$DBversion = "3.15.00.XXX";
7948
$DBversion = "3.15.00.XXX";
7949
if(CheckVersion($DBversion)) {
7949
if(CheckVersion($DBversion)) {
7950
    $dbh->do("ALTER TABLE categories ADD default_privacy ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default' AFTER categorycode");
7950
    $dbh->do("ALTER TABLE categories ADD default_privacy ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default' AFTER category_type");
7951
    print "Upgrade to $DBversion done (Bug 6254 - can't set patron privacy by default)\n";
7951
    print "Upgrade to $DBversion done (Bug 6254 - can't set patron privacy by default)\n";
7952
    SetVersion($DBversion);
7952
    SetVersion($DBversion);
7953
}
7953
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt (-2 / +1 lines)
Lines 247-253 Link Here
247
[% IF ( delete_confirm ) %]
247
[% IF ( delete_confirm ) %]
248
    <form action="[% script_name %]" method="post">
248
    <form action="[% script_name %]" method="post">
249
        <fieldset>
249
        <fieldset>
250
            <legend>    	
250
            <legend>
251
                [% IF ( patrons_in_category > 0 ) %]
251
                [% IF ( patrons_in_category > 0 ) %]
252
                    Category [% categorycode |html %] is in use.  Deletion not possible!
252
                    Category [% categorycode |html %] is in use.  Deletion not possible!
253
                [% ELSE %]
253
                [% ELSE %]
254
- 

Return to bug 6254