jro_apps/redmine Commit - r4382:9e2d401f43d9

Moves mail_notification param to user hash param so that it can be set using the User API....

Jean-Philippe Lang -

r4382:9e2d401f43d9

parent child

Context file:

r4382:9e2d401f43d9

Collapse all files

app/controllers/my_controller.rb +1 -3

                 @pref = @user.pref
                 if request.post?
                   @user.safe_attributes = params[:user]
-                  @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] : [])
+                    @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
                     set_language_if_valid @user.language
                     flash[:notice] = l(:notice_account_updated)
                     redirect_to :action => 'account'
                   end
                 end
                 @notification_options = @user.valid_notification_options
-                @notification_option = @user.mail_notification #? ? 'all' : (@user.notified_projects_ids.empty? ? 'none' : 'selected')
               end
               # Manage user's password

app/controllers/users_controller.rb +4 -11

               def new
                 @notification_options = User::MAIL_NOTIFICATION_OPTIONS
-                @notification_option = Setting.default_notification_option
-                @user = User.new(:language => Setting.default_language)
+                @user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option)
                 @auth_sources = AuthSource.find(:all)
               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
+                @user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option)
                 @user.safe_attributes = params[:user]
                 @user.admin = params[:user][:admin] || false
                 @user.login = params[:user][:login]
                 @user.password, @user.password_confirmation = params[:user][:password], params[:user][: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] : [])
+                  @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
                   Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
                   end
                 else
                   @auth_sources = AuthSource.find(:all)
-                  @notification_option = @user.mail_notification
                   # Clear password input
                   @user.password = @user.password_confirmation = nil
               def edit
                 @user = User.find(params[:id])
                 @notification_options = @user.valid_notification_options
-                @notification_option = @user.mail_notification
                 @auth_sources = AuthSource.find(:all)
                 @membership ||= Member.new
               def update
                 @user = User.find(params[:id])
                 @notification_options = @user.valid_notification_options
-                @notification_option = @user.mail_notification
                 @user.admin = params[:user][:admin] if params[:user][:admin]
                 @user.login = params[:user][:login] if params[:user][:login]
                 # 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] : [])
+                  @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
                   if was_activated
                     Mailer.deliver_account_activated(@user)

app/views/users/_mail_notifications.html.erb +3 -3

             <p>
-            <%= select_tag 'notification_option', options_for_select(@notification_options.collect {|o| [l(o.last), o.first]}, @notification_option),
+            <%= select_tag 'user[mail_notification]', options_for_select(@notification_options.collect {|o| [l(o.last), o.first]}, @user.mail_notification),
-                                                  :onchange => 'if ($("notification_option").value == "selected") {Element.show("notified-projects")} else {Element.hide("notified-projects")}' %>
+                                                  :onchange => 'if (this.value == "selected") {Element.show("notified-projects")} else {Element.hide("notified-projects")}' %>
             </p>
-            <% content_tag 'div', :id => 'notified-projects', :style => (@notification_option == 'selected' ? '' : 'display:none;') do %>
+            <% content_tag 'div', :id => 'notified-projects', :style => (@user.mail_notification == 'selected' ? '' : 'display:none;') do %>
             <p><% @user.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>

test/functional/users_controller_test.rb +5 -5

                       :login => 'jdoe',
                       :password => 'test',
                       :password_confirmation => 'test',
-                      :mail => 'jdoe@gmail.com'
+                      :mail => 'jdoe@gmail.com',
-                    },
+                      :mail_notification => 'none'
-                    :notification_option => 'none'
                   end
                   should_assign_to :user
               def test_update
                 ActionMailer::Base.deliveries.clear
-                put :update, :id => 2, :user => {:firstname => 'Changed'}, :notification_option => 'all', :pref => {:hide_mail => '1', :comments_sorting => 'desc'}
+                put :update, :id => 2, :user => {:firstname => 'Changed', :mail_notification => 'only_assigned'}, :pref => {:hide_mail => '1', :comments_sorting => 'desc'}
                 user = User.find(2)
                 assert_equal 'Changed', user.firstname
-                assert_equal 'all', user.mail_notification
+                assert_equal 'only_assigned', user.mail_notification
                 assert_equal true, user.pref[:hide_mail]
                 assert_equal 'desc', user.pref[:comments_sorting]
                 assert ActionMailer::Base.deliveries.empty?

test/integration/api_test/users_test.rb +2 -1

               context "POST /users" do
                 context "with valid parameters" do
                   setup do
-                    @parameters = {:user => {:login => 'foo', :firstname => 'Firstname', :lastname => 'Lastname', :mail => 'foo@example.net', :password => 'secret'}}
+                    @parameters = {:user => {:login => 'foo', :firstname => 'Firstname', :lastname => 'Lastname', :mail => 'foo@example.net', :password => 'secret', :mail_notification => 'only_assigned'}}
                   end
                   context ".xml" do
                       assert_equal 'Firstname', user.firstname
                       assert_equal 'Lastname', user.lastname
                       assert_equal 'foo@example.net', user.mail
+                      assert_equal 'only_assigned', user.mail_notification
                       assert !user.admin?
                       assert user.check_password?('secret')

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