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

(-)a/Koha.pm (-1 / +1 lines)
Lines 29-35 use vars qw{ $VERSION }; Link Here
29
# - #4 : the developer version. The 4th number is the database subversion.
29
# - #4 : the developer version. The 4th number is the database subversion.
30
#        used by developers when the database changes. updatedatabase take care of the changes itself
30
#        used by developers when the database changes. updatedatabase take care of the changes itself
31
#        and is automatically called by Auth.pm when needed.
31
#        and is automatically called by Auth.pm when needed.
32
$VERSION = "17.12.00.024";
32
$VERSION = "17.12.00.025";
33
33
34
sub version {
34
sub version {
35
    return $VERSION;
35
    return $VERSION;
(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
Lines 15706-15711 if( CheckVersion( $DBversion ) ) { Link Here
15706
    SetVersion( $DBversion );
15706
    SetVersion( $DBversion );
15707
    print "Upgrade to $DBversion done (Bug 15492: Add a standalone self-checkin module)\n";
15707
    print "Upgrade to $DBversion done (Bug 15492: Add a standalone self-checkin module)\n";
15708
}
15708
}
15709
$DBversion = '17.12.00.025';
15710
if( CheckVersion( $DBversion ) ) {
15711
    $dbh->do(q{
15712
        DELETE FROM systempreferences
15713
        WHERE variable='checkdigit'
15714
    });
15715
15716
    SetVersion( $DBversion );
15717
    print "Upgrade to $DBversion done (Bug 20264 - Remove system preference 'checkdigit')\n";
15718
}
15709
15719
15710
# SEE bug 13068
15720
# SEE bug 13068
15711
# if there is anything in the atomicupdate, read and execute it.
15721
# if there is anything in the atomicupdate, read and execute it.
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-7 lines)
Lines 34-46 Link Here
34
                [% END %]
34
                [% END %]
35
            </div> <!-- /.col-sm-2 -->
35
            </div> <!-- /.col-sm-2 -->
36
            <div class="col-sm-9">
36
            <div class="col-sm-9">
37
                [% IF adminWarning %]
38
                    <div id="adminwarning" class="dialog alert">
39
                        <p><strong>Warning:</strong> You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.</p>
40
                        <p>Please log in instead with a regular staff account. To create a staff account, create a library, a patron category 'Staff' and add a new patron. Then give this patron permissions from 'More' in the toolbar.</p>
41
                        <p><a class="btn btn-default btn-sm" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-plus"> </i> Create patron</a></p>
42
                    </div>
43
                [% END %]
44
                <div class="row">
37
                <div class="row">
45
                    <div class="col-xs-6">
38
                    <div class="col-xs-6">
46
                        <ul class="biglinks-list">
39
                        <ul class="biglinks-list">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-11 lines)
Lines 38-54 Link Here
38
            <div class="span10">
38
            <div class="span10">
39
                <div id="userdetails" class="maincontent">
39
                <div id="userdetails" class="maincontent">
40
40
41
                    [% IF adminWarning %]
42
                        <div id="adminwarning" class="dialog alert">
43
                            <p>
44
<strong><i class="fa fa-exclamation-triangle"> </i> Warning:</strong>
45
Using this account is not recommended because some parts of Koha will not function as expected. Instead, please log in with a different account.
46
<a class="btn btn-small" href="/cgi-bin/koha/opac-main.pl?logout.x=1">
47
<i class="fa fa-sign-out"> </i> Log out</a>
48
                            </p>
49
                        </div>
50
                    [% END %]
51
52
                    [% INCLUDE 'opac-note.inc' %]
41
                    [% INCLUDE 'opac-note.inc' %]
53
42
54
                    <h2>Hello, [% INCLUDE 'patron-title.inc' category_type = BORROWER_INFO.category_type firstname = BORROWER_INFO.firstname surname = BORROWER_INFO.surname othernames = BORROWER_INFO.othernames cardnumber = BORROWER_INFO.cardnumber %]
43
                    <h2>Hello, [% INCLUDE 'patron-title.inc' category_type = BORROWER_INFO.category_type firstname = BORROWER_INFO.firstname surname = BORROWER_INFO.surname othernames = BORROWER_INFO.othernames cardnumber = BORROWER_INFO.cardnumber %]
(-)a/mainpage.pl (-7 lines)
Lines 84-94 $template->param( Link Here
84
    pending_article_requests       => $pending_article_requests,
84
    pending_article_requests       => $pending_article_requests,
85
);
85
);
86
86
87
#
88
# warn user if they are using mysql/admin login
89
#
90
unless ($loggedinuser) {
91
    $template->param(adminWarning => 1);
92
}
93
94
output_html_with_http_headers $query, $cookie, $template->output;
87
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/opac/opac-user.pl (-5 lines)
Lines 88-97 my $canrenew = 1; Link Here
88
88
89
$template->param( shibbolethAuthentication => C4::Context->config('useshibboleth') );
89
$template->param( shibbolethAuthentication => C4::Context->config('useshibboleth') );
90
90
91
if (!$borrowernumber) {
92
    $template->param( adminWarning => 1 );
93
}
94
95
# get borrower information ....
91
# get borrower information ....
96
my $patron = Koha::Patrons->find( $borrowernumber );
92
my $patron = Koha::Patrons->find( $borrowernumber );
97
my $borr = $patron->unblessed;
93
my $borr = $patron->unblessed;
98
- 

Return to bug 20489