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

(-)a/C4/Auth.pm (+1 lines)
Lines 316-321 sub get_template_and_user { Link Here
316
    $template->param(
316
    $template->param(
317
            "BiblioDefaultView".C4::Context->preference("BiblioDefaultView")         => 1,
317
            "BiblioDefaultView".C4::Context->preference("BiblioDefaultView")         => 1,
318
            EnhancedMessagingPreferences => C4::Context->preference('EnhancedMessagingPreferences'),
318
            EnhancedMessagingPreferences => C4::Context->preference('EnhancedMessagingPreferences'),
319
            OPACEnhancedMessagingPreferences => C4::Context->preference('OPACEnhancedMessagingPreferences'),
319
            GoogleJackets                => C4::Context->preference("GoogleJackets"),
320
            GoogleJackets                => C4::Context->preference("GoogleJackets"),
320
            OpenLibraryCovers            => C4::Context->preference("OpenLibraryCovers"),
321
            OpenLibraryCovers            => C4::Context->preference("OpenLibraryCovers"),
321
            KohaAdminEmailAddress        => "" . C4::Context->preference("KohaAdminEmailAddress"),
322
            KohaAdminEmailAddress        => "" . C4::Context->preference("KohaAdminEmailAddress"),
(-)a/installer/data/mysql/sysprefs.sql (+2 lines)
Lines 408-410 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
408
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('NotesBlacklist','','List of notes fields that should not appear in the title notes/description separator of details',NULL,'free');
408
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('NotesBlacklist','','List of notes fields that should not appear in the title notes/description separator of details',NULL,'free');
409
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserCSS', '', NULL, 'Add CSS to be included in the SCO module in an embedded <style> tag.', 'free');
409
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserCSS', '', NULL, 'Add CSS to be included in the SCO module in an embedded <style> tag.', 'free');
410
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserJS', '', NULL, 'Define custom javascript for inclusion in the SCO module', 'free');
410
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserJS', '', NULL, 'Define custom javascript for inclusion in the SCO module', 'free');
411
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RenewalSendNotices','0', NULL, '', 'YesNo');
412
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACEnhancedMessagingPreferences',1, 'Show the patrons messaging preferences page in the OPAC', NULL, 'YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 6377-6382 if ( CheckVersion($DBversion) ) { Link Here
6377
        UPDATE userflags SET flagdesc="Add or modify patrons" where flag="borrowers";
6377
        UPDATE userflags SET flagdesc="Add or modify patrons" where flag="borrowers";
6378
        });
6378
        });
6379
   $dbh->do(q{
6379
   $dbh->do(q{
6380
       A
6380
        UPDATE userflags SET flagdesc="Use all tools (expand for granular tools permissions)" where flag="tools";
6381
        UPDATE userflags SET flagdesc="Use all tools (expand for granular tools permissions)" where flag="tools";
6381
        });
6382
        });
6382
   $dbh->do(q{
6383
   $dbh->do(q{
Lines 6390-6395 if ( CheckVersion($DBversion) ) { Link Here
6390
   SetVersion ($DBversion);
6391
   SetVersion ($DBversion);
6391
}
6392
}
6392
6393
6394
$DBversion = "3.11.00.XXX";
6395
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
6396
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACEnhancedMessagingPreferences',1, 'Show the patrons messaging preferences page in the OPAC', NULL, 'YesNo')");
6397
    print "Upgrade to $DBversion done (Bug 9254: Problem with EnhancedMessagingPreferences) \n";
6398
    SetVersion ($DBversion);
6399
}
6400
6393
=head1 FUNCTIONS
6401
=head1 FUNCTIONS
6394
6402
6395
=head2 TableExists($table)
6403
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (-1 / +7 lines)
Lines 60-66 Patrons: Link Here
60
           choices:
60
           choices:
61
               yes: Allow
61
               yes: Allow
62
               no: "Don't allow"
62
               no: "Don't allow"
63
         - patrons to choose which notices they receive and when they receive them. Note that this only applies to certain kinds of notices.
63
         - patrons to receive notices. Note that this only applies to certain kinds of notices.
64
     -
65
         - pref: OPACEnhancedMessagingPreferences
66
           choices:
67
               yes: Allow
68
               no: "Don't allow"
69
         - patrons to choose which notices they receive and when they receive them in the OPAC. Note that this only works if EnhancedMessagingPreferences is active.
64
     -
70
     -
65
         - pref: ExtendedPatronAttributes
71
         - pref: ExtendedPatronAttributes
66
           choices:
72
           choices:
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc (-2 / +1 lines)
Lines 26-32 Link Here
26
      [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/opac-suggestions.pl">my purchase suggestions</a></li>
26
      [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/opac-suggestions.pl">my purchase suggestions</a></li>
27
    [% END %]
27
    [% END %]
28
  [% END %]
28
  [% END %]
29
  [% IF ( EnhancedMessagingPreferences ) %]
29
  [% IF ( EnhancedMessagingPreferences && OPACEnhancedMessagingPreferences ) %]
30
    [% IF ( messagingview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/opac-messaging.pl">my messaging</a></li>
30
    [% IF ( messagingview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/opac-messaging.pl">my messaging</a></li>
31
  [% END %]
31
  [% END %]
32
  [% IF ( virtualshelves ) %] 
32
  [% IF ( virtualshelves ) %] 
33
- 

Return to bug 9254