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

(-)a/C4/Auth.pm (+1 lines)
Lines 315-320 sub get_template_and_user { Link Here
315
    $template->param(
315
    $template->param(
316
            "BiblioDefaultView".C4::Context->preference("BiblioDefaultView")         => 1,
316
            "BiblioDefaultView".C4::Context->preference("BiblioDefaultView")         => 1,
317
            EnhancedMessagingPreferences => C4::Context->preference('EnhancedMessagingPreferences'),
317
            EnhancedMessagingPreferences => C4::Context->preference('EnhancedMessagingPreferences'),
318
            OPACEnhancedMessagingPreferences => C4::Context->preference('OPACEnhancedMessagingPreferences'),
318
            GoogleJackets                => C4::Context->preference("GoogleJackets"),
319
            GoogleJackets                => C4::Context->preference("GoogleJackets"),
319
            OpenLibraryCovers            => C4::Context->preference("OpenLibraryCovers"),
320
            OpenLibraryCovers            => C4::Context->preference("OpenLibraryCovers"),
320
            KohaAdminEmailAddress        => "" . C4::Context->preference("KohaAdminEmailAddress"),
321
            KohaAdminEmailAddress        => "" . C4::Context->preference("KohaAdminEmailAddress"),
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 400-402 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
400
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacSeparateHoldings', '0', 'Separate current branch holdings from other holdings (OPAC)', NULL, 'YesNo');
400
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacSeparateHoldings', '0', 'Separate current branch holdings from other holdings (OPAC)', NULL, 'YesNo');
401
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacSeparateHoldingsBranch', 'homebranch', 'Branch used to separate holdings (OPAC)', 'homebranch|holdingbranch', 'Choice');
401
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacSeparateHoldingsBranch', 'homebranch', 'Branch used to separate holdings (OPAC)', 'homebranch|holdingbranch', 'Choice');
402
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RenewalSendNotices','0', NULL, '', 'YesNo');
402
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RenewalSendNotices','0', NULL, '', 'YesNo');
403
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 (+7 lines)
Lines 6309-6314 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
6309
    SetVersion($DBversion);
6309
    SetVersion($DBversion);
6310
}
6310
}
6311
6311
6312
$DBversion = "3.11.00.XXX";
6313
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
6314
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACEnhancedMessagingPreferences',1, 'Show the patrons messaging preferences page in the OPAC', NULL, 'YesNo')");
6315
    print "Upgrade to $DBversion done (Bug 9254: Problem with EnhancedMessagingPreferences) \n";
6316
    SetVersion ($DBversion);
6317
}
6318
6312
=head1 FUNCTIONS
6319
=head1 FUNCTIONS
6313
6320
6314
=head2 TableExists($table)
6321
=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