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

(-)a/C4/Auth.pm (+1 lines)
Lines 317-322 sub get_template_and_user { Link Here
317
    $template->param(
317
    $template->param(
318
            "BiblioDefaultView".C4::Context->preference("BiblioDefaultView")         => 1,
318
            "BiblioDefaultView".C4::Context->preference("BiblioDefaultView")         => 1,
319
            EnhancedMessagingPreferences => C4::Context->preference('EnhancedMessagingPreferences'),
319
            EnhancedMessagingPreferences => C4::Context->preference('EnhancedMessagingPreferences'),
320
            OPACEnhancedMessagingPreferences => C4::Context->preference('OPACEnhancedMessagingPreferences'),
320
            GoogleJackets                => C4::Context->preference("GoogleJackets"),
321
            GoogleJackets                => C4::Context->preference("GoogleJackets"),
321
            OpenLibraryCovers            => C4::Context->preference("OpenLibraryCovers"),
322
            OpenLibraryCovers            => C4::Context->preference("OpenLibraryCovers"),
322
            KohaAdminEmailAddress        => "" . C4::Context->preference("KohaAdminEmailAddress"),
323
            KohaAdminEmailAddress        => "" . C4::Context->preference("KohaAdminEmailAddress"),
(-)a/installer/data/mysql/sysprefs.sql (+2 lines)
Lines 416-418 INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ( Link Here
416
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('IntranetNumbersPreferPhrase','0', NULL, 'Control the use of phr operator in callnumber and standard number staff client searches', 'YesNo');
416
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('IntranetNumbersPreferPhrase','0', NULL, 'Control the use of phr operator in callnumber and standard number staff client searches', 'YesNo');
417
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UNIMARCField100Language', 'fre','UNIMARC field 100 default language',NULL,'short');
417
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UNIMARCField100Language', 'fre','UNIMARC field 100 default language',NULL,'short');
418
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('Persona',0,'Use Mozilla Persona for login','','YesNo');
418
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('Persona',0,'Use Mozilla Persona for login','','YesNo');
419
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RenewalSendNotices','0', NULL, '', 'YesNo');
420
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 (+6 lines)
Lines 6437-6442 if ( CheckVersion($DBversion) ) { Link Here
6437
    SetVersion($DBversion);
6437
    SetVersion($DBversion);
6438
}
6438
}
6439
6439
6440
$DBversion = "3.11.00.XXX";
6441
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
6442
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACEnhancedMessagingPreferences',1, 'Show the patrons messaging preferences page in the OPAC', NULL, 'YesNo')");
6443
    print "Upgrade to $DBversion done (Bug 9254: Problem with EnhancedMessagingPreferences) \n";
6444
    SetVersion ($DBversion);
6445
}
6440
6446
6441
=head1 FUNCTIONS
6447
=head1 FUNCTIONS
6442
6448
(-)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