jro_apps/redmine Commit - r11855:936ef250b4ca

Add hooks for user preferences (#14614)....

Jean-Philippe Lang -

r11855:936ef250b4ca

parent child

Context file:

r11855:936ef250b4ca

Collapse all files

app/views/my/account.html.erb +1 0

             <div class="contextual">
             <%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %>
             <%= call_hook(:view_my_account_contextual, :user => @user)%>
             </div>
             <h2><%=l(:label_my_account)%></h2>
             <%= error_messages_for 'user' %>
             <%= labelled_form_for :user, @user,
                                  :url => { :action => "account" },
                                  :html => { :id => 'my_account_form',
                                             :method => :post } do |f| %>
             <div class="splitcontentleft">
             <fieldset class="box tabular">
               <legend><%=l(:label_information_plural)%></legend>
               <p><%= f.text_field :firstname, :required => true %></p>
               <p><%= f.text_field :lastname, :required => true %></p>
               <p><%= f.text_field :mail, :required => true %></p>
               <p><%= f.select :language, lang_options_for_select %></p>
               <% if Setting.openid? %>
               <p><%= f.text_field :identity_url  %></p>
               <% end %>
               <% @user.custom_field_values.select(&:editable?).each do |value| %>
                 <p><%= custom_field_tag_with_label :user, value %></p>
               <% end %>
               <%= call_hook(:view_my_account, :user => @user, :form => f) %>
             </fieldset>
             <%= submit_tag l(:button_save) %>
             </div>
             <div class="splitcontentright">
             <fieldset class="box">
               <legend><%=l(:field_mail_notification)%></legend>
               <%= render :partial => 'users/mail_notifications' %>
             </fieldset>
             <fieldset class="box tabular">
               <legend><%=l(:label_preferences)%></legend>
               <%= render :partial => 'users/preferences' %>
+              <%= call_hook(:view_my_account_preferences, :user => @user, :form => f) %>
             </fieldset>
             </div>
             <% end %>
             <% content_for :sidebar do %>
             <%= render :partial => 'sidebar' %>
             <% end %>
             <% html_title(l(:label_my_account)) -%>

app/views/users/_form.html.erb +1 0

             <%= error_messages_for 'user' %>
             <div id="user_form">
             <!--[form:user]-->
             <div class="splitcontentleft">
             <fieldset class="box tabular">
               <legend><%=l(:label_information_plural)%></legend>
               <p><%= f.text_field :login, :required => true, :size => 25  %></p>
               <p><%= f.text_field :firstname, :required => true %></p>
               <p><%= f.text_field :lastname, :required => true %></p>
               <p><%= f.text_field :mail, :required => true %></p>
               <p><%= f.select :language, lang_options_for_select %></p>
               <% if Setting.openid? %>
               <p><%= f.text_field :identity_url  %></p>
               <% end %>
               <% @user.custom_field_values.each do |value| %>
                 <p><%= custom_field_tag_with_label :user, value %></p>
               <% end %>
               <p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
               <%= call_hook(:view_users_form, :user => @user, :form => f) %>
             </fieldset>
             <fieldset class="box tabular">
               <legend><%=l(:label_authentication)%></legend>
               <% unless @auth_sources.empty? %>
               <p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {$('#password_fields').show();} else {$('#password_fields').hide();}" %></p>
               <% end %>
               <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
               <p><%= f.password_field :password, :required => true, :size => 25  %>
               <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
               <p><%= f.password_field :password_confirmation, :required => true, :size => 25  %></p>
               <p><%= f.check_box :generate_password %></p>
               <p><%= f.check_box :must_change_passwd %></p>
               </div>
             </fieldset>
             </div>
             <div class="splitcontentright">
             <fieldset class="box">
               <legend><%=l(:field_mail_notification)%></legend>
               <%= render :partial => 'users/mail_notifications' %>
             </fieldset>
             <fieldset class="box tabular">
               <legend><%=l(:label_preferences)%></legend>
               <%= render :partial => 'users/preferences' %>
+              <%= call_hook(:view_users_form_preferences, :user => @user, :form => f) %>
             </fieldset>
             </div>
             </div>
             <div style="clear:left;"></div>
             <!--[eoform:user]-->
             <%= javascript_tag do %>
             $(document).ready(function(){
               $('#user_generate_password').change(function(){
                 var passwd = $('#user_password, #user_password_confirmation');
                 if ($(this).is(':checked')){
                   passwd.val('').attr('disabled', true);
                 }else{
                   passwd.removeAttr('disabled');
                 }
               }).trigger('change');
             });
             <% end %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages