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

(-)a/installer/data/mysql/atomicupdate/sysprefs_Bug12528.sql (-1 / +1 lines)
Lines 1-2 Link Here
1 
INSERT INTO systempreferences ( value, variable, options, explanation,type )
 1 
INSERT INTO systempreferences ( value, variable, options, explanation,type )
2 
select value ,'OPACEnhancedMessagingPreferences', NULL, 'If ON, allows patrons to select to receive additional messages about items due or nearly due.', 'YesNo' from systempreferences where variable='EnhancedMessagingPreferences';
 2 
select value ,'EnhancedMessagingPreferencesOPAC', NULL, 'If ON, allows patrons to select to receive additional messages about items due or nearly due.', 'YesNo' from systempreferences where variable='EnhancedMessagingPreferences';
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (-2 / +2 lines)
Lines 54-60 Patrons: Link Here
54 
           choices:
 54 
           choices:
55 
               yes: Allow
 55 
               yes: Allow
56 
               no: "Don't allow"
 56 
               no: "Don't allow"
57 
         - "Staff to manage which notices patrons will receive and when they will receive them. Note: this only applies to courtesy notices. To manage if patrons have also access to these settings, use OPACEnhancedMessagingPreferences."
 57 
         - "Staff to manage which notices patrons will receive and when they will receive them. Note: this only applies to courtesy notices. To manage if patrons have also access to these settings, use EnhancedMessagingPreferencesOPAC."
58 
     -
 58 
     -
59 
         - pref: ExtendedPatronAttributes
 59 
         - pref: ExtendedPatronAttributes
60 
           choices:
 60 
           choices:
Lines 160-166 Patrons: Link Here
160 
               no: "Don't"
 160 
               no: "Don't"
161 
         - charge a fee when a patron changes to a category with an enrollment fee.
 161 
         - charge a fee when a patron changes to a category with an enrollment fee.
162 
     -
 162 
     -
163 
         - pref: OPACEnhancedMessagingPreferences
 163 
         - pref: EnhancedMessagingPreferencesOPAC
164 
           choices:
 164 
           choices:
165 
               yes: Show
 165 
               yes: Show
166 
               no: "Don't show"
 166 
               no: "Don't show"
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc (-1 / +1 lines)
Lines 77-83 Link Here
77 
            [% END %]
 77 
            [% END %]
78 

          78
          

        

        

          79
          
            [% IF ( EnhancedMessagingPreferences ) %]

          79
          
            [% IF ( EnhancedMessagingPreferences ) %]

        

          
            

              80
              
                [% IF Koha.Preference( 'OPACEnhancedMessagingPreferences' ) %]


              80
              
                [% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' ) %]

            

        

          81
          
                    [% IF ( messagingview ) %]

          81
          
                    [% IF ( messagingview ) %]

        

        

          82
          
                        <li class="active">

          82
          
                        <li class="active">

        

        

          83
          
                    [% ELSE %]

          83
          
                    [% ELSE %]

        



(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
      (-8 lines)




  

    
      
            Lines 22-29
          
      
      
        Link Here
      
    
  

        

          22
          
                </div>

          22
          
                </div>

        

        

          23
          
            </div>

          23
          
            </div>

        

        

          24
          
            <div class="span10">

          24
          
            <div class="span10">

        

            

              25
              
            [% IF Koha.Preference( 'EnhancedMessagingPreferences' )  %]

              
              
            

            

              26
              
                [% IF Koha.Preference( 'OPACEnhancedMessagingPreferences' )  %]

            

        

          27
          
                <div id="usermessaging">

          25
          
                <div id="usermessaging">

        

        

          28
          
                    <h3>Your messaging settings</h3>

          26
          
                    <h3>Your messaging settings</h3>

        

        

          29
          
                    [% IF ( settings_updated ) %]

          27
          
                    [% IF ( settings_updated ) %]

        

  

    
      
            Lines 131-142
          
      
      
        Link Here
      
    
  

        

          131
          
                        </fieldset>

          129
          
                        </fieldset>

        

        

          132
          
                    </form>

          130
          
                    </form>

        

        

          133
          
                </div> <!-- / #usermessaging -->

          131
          
                </div> <!-- / #usermessaging -->

        

            

              134
              
                [% ELSE %]

              
              
            

            

              135
              
                    <h4>You are not allowed to call this page directly</h4>

            

            

              136
              
                [% END %]

            

            

              137
              
            [% ELSE %]

            

            

              138
              
                <h4>You are not allowed to call this page directly</h4>

            

            

              139
              
            [% END %]

            

        

          140
          
             </div> <!-- / .span10 -->

          132
          
             </div> <!-- / .span10 -->

        

        

          141
          
        </div> <!-- / .row-fluid -->

          133
          
        </div> <!-- / .row-fluid -->

        

        

          142
          
    </div> <!-- / .container-fluid -->

          134
          
    </div> <!-- / .container-fluid -->

        



(-)a/opac/opac-messaging.pl
      (-1 / +4 lines)




  

    
      
            Lines 34-39
          use C4::Form::MessagingPreferences;
      
      
        Link Here
      
    
  

        

          34
          

          34
          

        

        

          35
          
my $query = CGI->new();

          35
          
my $query = CGI->new();

        

        

          36
          

          36
          

        

            

              
              
              37
              
unless ( C4::Context->preference('EnhancedMessagingPreferencesOPAC') && C4::Context->preference('EnhancedMessagingPreferences') ) {

            

            

              38
              
    print $query->redirect("/cgi-bin/koha/errors/404.pl");

            

            

              39
              
    exit;

            

            

              40
              
}

            

        

          37
          
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(

          41
          
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(

        

        

          38
          
    {

          42
          
    {

        

        

          39
          
        template_name   => 'opac-messaging.tt',

          43
          
        template_name   => 'opac-messaging.tt',

        

            

              40
              
- 

              
              
            






  

  Return to bug 12528