jro_apps/redmine Commit - r4109:437690119b0b

Allow admins to edit user's email notifications and preferences. #3503...

Eric Davis -

r4109:437690119b0b

parent child

Context file:

r4109:437690119b0b

Collapse all files

app/views/users/_mail_notifications.html.erb created 644 +12 0

@@ -0,0 +1,12
	1	<p>
	2	<%= select_tag 'notification_option', options_for_select(@notification_options.collect {\|o\| [l(o.last), o.first]}, @notification_option.to_sym),
	3	:onchange => 'if ($("notification_option").value == "selected") {Element.show("notified-projects")} else {Element.hide("notified-projects")}' %>
	4	</p>
	5	<% content_tag 'div', :id => 'notified-projects', :style => (@notification_option == 'selected' ? '' : 'display:none;') do %>
	6	<p><% @user.projects.each do \|project\| %>
	7	<label><%= check_box_tag 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) %> <%=h project.name %></label><br />
	8	<% end %></p>
	9	<p><em><%= l(:text_user_mail_option) %></em></p>
	10	<% end %>
	11	<p><label><%= l(:label_user_mail_no_self_notified) %></label><%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified] %></p>
	12

app/views/users/_preferences.html.erb created 644 +6 0

@@ -0,0 +1,6
	1	<% fields_for :pref, @user.pref, :builder => TabularFormBuilder, :lang => current_language do \|pref_fields\| %>
	2	<p><%= pref_fields.check_box :hide_mail %></p>
	3	<p><%= pref_fields.select :time_zone, ActiveSupport::TimeZone.all.collect {\|z\| [ z.to_s, z.name ]}, :include_blank => true %></p>
	4	<p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p>
	5	<% end %>
	6

app/controllers/users_controller.rb +43 0

               end
               def add
+                @notification_options = User::MAIL_NOTIFICATION_OPTIONS
+                @notification_option = Setting.default_notification_option
                 @user = User.new(:language => Setting.default_language)
                 @auth_sources = AuthSource.find(:all)
+                # TODO: Similar to My#account
+                # Only users that belong to more than 1 project can select projects for which they are notified
+                # Note that @user.membership.size would fail since AR ignores
+                # :include association option when doing a count
+                if @user.memberships.length < 1
+                  @notification_options.delete_if {|option| option.first == :selected}
+                end
               end
               verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
               def create
+                @notification_options = User::MAIL_NOTIFICATION_OPTIONS
+                @notification_option = Setting.default_notification_option
                 @user = User.new(params[:user])
                 @user.admin = params[:user][:admin] || false
                 @user.login = params[:user][:login]
                 @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
+                # TODO: Similar to My#account
+                @user.mail_notification = params[:notification_option] || 'only_my_events'
+                @user.pref.attributes = params[:pref]
+                @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
                 if @user.save
+                  @user.pref.save
+                  @user.notified_project_ids = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])
                   Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to(params[:continue] ? {:controller => 'users', :action => 'add'} :
                   return
                 else
                   @auth_sources = AuthSource.find(:all)
+                  @notification_option = @user.mail_notification
                   render :action => 'add'
                 end
               end
               def edit
                 @user = User.find(params[:id])
+                # TODO: Similar to My#account
+                @notification_options = User::MAIL_NOTIFICATION_OPTIONS
+                # Only users that belong to more than 1 project can select projects for which they are notified
+                # Note that @user.membership.size would fail since AR ignores
+                # :include association option when doing a count
+                if @user.memberships.length < 1
+                  @notification_options.delete_if {|option| option.first == :selected}
+                end
+                @notification_option = @user.mail_notification
                 if request.post?
                   @user.admin = params[:user][:admin] if params[:user][:admin]
                   @user.login = params[:user][:login] if params[:user][:login]
                   @user.attributes = params[:user]
                   # Was the account actived ? (do it before User#save clears the change)
                   was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
+                  # TODO: Similar to My#account
+                  @user.mail_notification = params[:notification_option] || 'only_my_events'
+                  @user.pref.attributes = params[:pref]
+                  @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
                   if @user.save
+                    @user.pref.save
+                    @user.notified_project_ids = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])
                     if was_activated
                       Mailer.deliver_account_activated(@user)
                     elsif @user.active? && params[:send_information] && !params[:password].blank? && @user.auth_source_id.nil?

app/models/user.rb +1 -1

               validates_confirmation_of :password, :allow_nil => true
               def before_create
-                self.mail_notification = Setting.default_notification_option
+                self.mail_notification = Setting.default_notification_option if self.mail_notification.blank?
                 true
               end

app/views/my/account.rhtml +2 -14

             <div class="splitcontentright">
             <h3><%=l(:field_mail_notification)%></h3>
             <div class="box">
-            <%= select_tag 'notification_option', options_for_select(@notification_options.collect {|o| [l(o.last), o.first]}, @notification_option.to_sym),
+            <%= render :partial => 'users/mail_notifications' %>
-                                                  :onchange => 'if ($("notification_option").value == "selected") {Element.show("notified-projects")} else {Element.hide("notified-projects")}' %>
-            <% content_tag 'div', :id => 'notified-projects', :style => (@notification_option == 'selected' ? '' : 'display:none;') do %>
-            <p><% User.current.projects.each do |project| %>
-                <label><%= check_box_tag 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) %> <%=h project.name %></label><br />
-            <% end %></p>
-            <p><em><%= l(:text_user_mail_option) %></em></p>
-            <% end %>
-            <p><label><%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified] %> <%= l(:label_user_mail_no_self_notified) %></label></p>
             </div>
             <h3><%=l(:label_preferences)%></h3>
             <div class="box tabular">
-            <% fields_for :pref, @user.pref, :builder => TabularFormBuilder, :lang => current_language do |pref_fields| %>
+            <%= render :partial => 'users/preferences' %>
-            <p><%= pref_fields.check_box :hide_mail %></p>
-            <p><%= pref_fields.select :time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p>
-            <p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p>
-            <% end %>
             </div>
             </div>

app/views/users/_form.rhtml +10 0

@@ -32,4 +32,14
32	<%= password_field_tag 'password_confirmation', nil, :size => 25 %></p>	32	<%= password_field_tag 'password_confirmation', nil, :size => 25 %></p>
33	</div>	33	</div>
34	</div>	34	</div>
		35
		36	<div class="box">
		37	<h3><%=l(:field_mail_notification)%></h3>
		38	<%= render :partial => 'users/mail_notifications' %>
		39	</div>
		40
		41	<div class="box tabular">
		42	<h3><%=l(:label_preferences)%></h3>
		43	<%= render :partial => 'users/preferences' %>
		44	</div>
35	<!--[eoform:user]-->	45	<!--[eoform:user]-->

test/functional/users_controller_test.rb +14 -3

                       :password => 'test',
                       :password_confirmation => 'test',
                       :mail => 'jdoe@gmail.com'
+                    },
+                    :notification_option => 'none'
                   end
                   should_assign_to :user
                   should_respond_with :redirect
                   should_redirect_to('user edit') { {:controller => 'users', :action => 'edit', :id => User.find_by_login('jdoe')}}
+                  should 'set the users mail notification' do
+                    user = User.last
+                    assert_equal 'none', user.mail_notification
+                  end
                 end
                 context "when unsuccessful" do
               def test_edit
                 ActionMailer::Base.deliveries.clear
-                post :edit, :id => 2, :user => {:firstname => 'Changed'}
+                post :edit, :id => 2, :user => {:firstname => 'Changed'}, :notification_option => 'all', :pref => {:hide_mail => '1', :comments_sorting => 'desc'}
-                assert_equal 'Changed', User.find(2).firstname
+                user = User.find(2)
+                assert_equal 'Changed', user.firstname
+                assert_equal 'all', user.mail_notification
+                assert_equal true, user.pref[:hide_mail]
+                assert_equal 'desc', user.pref[:comments_sorting]
                 assert ActionMailer::Base.deliveries.empty?
               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