diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/my_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/users_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 20 | ||||
| -rw-r--r-- | app/views/users/_mail_notifications.html.erb | 3 |
4 files changed, 18 insertions, 8 deletions
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index 92853067b..5328991b3 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -55,7 +55,6 @@ class MyController < ApplicationController @user.pref.attributes = params[:pref] if @user.save @user.pref.save - @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 my_account_path diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 5dd154dc0..3ea65c7aa 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -94,7 +94,6 @@ class UsersController < ApplicationController if @user.save @user.pref.attributes = params[:pref] @user.pref.save - @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : []) Mailer.account_information(@user, @user.password).deliver if params[:send_information] @@ -141,7 +140,6 @@ class UsersController < ApplicationController if @user.save @user.pref.save - @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : []) if was_activated Mailer.account_activated(@user).deliver diff --git a/app/models/user.rb b/app/models/user.rb index 25cfebac6..738554d85 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -105,6 +105,7 @@ class User < Principal before_create :set_mail_notification before_save :generate_password_if_needed, :update_hashed_password before_destroy :remove_references_before_destroy + after_save :update_notified_project_ids scope :in_group, lambda {|group| group_id = group.is_a?(Group) ? group.id : group.to_i @@ -133,6 +134,8 @@ class User < Principal @name = nil @projects_by_role = nil @membership_by_project_id = nil + @notified_projects_ids = nil + @notified_projects_ids_changed = false base_reload(*args) end @@ -325,11 +328,19 @@ class User < Principal end def notified_project_ids=(ids) - Member.update_all("mail_notification = #{connection.quoted_false}", ['user_id = ?', id]) - Member.update_all("mail_notification = #{connection.quoted_true}", ['user_id = ? AND project_id IN (?)', id, ids]) if ids && !ids.empty? - @notified_projects_ids = nil - notified_projects_ids + @notified_projects_ids_changed = true + @notified_projects_ids = ids + end + + # Updates per project notifications (after_save callback) + def update_notified_project_ids + if @notified_projects_ids_changed + ids = (mail_notification == 'selected' ? Array.wrap(notified_projects_ids).reject(&:blank?) : []) + members.update_all(:mail_notification => false) + members.where(:project_id => ids).update_all(:mail_notification => true) if ids.any? + end end + private :update_notified_project_ids def valid_notification_options self.class.valid_notification_options(self) @@ -550,6 +561,7 @@ class User < Principal 'lastname', 'mail', 'mail_notification', + 'notified_project_ids', 'language', 'custom_field_values', 'custom_fields', diff --git a/app/views/users/_mail_notifications.html.erb b/app/views/users/_mail_notifications.html.erb index a31f6304b..51024fb9a 100644 --- a/app/views/users/_mail_notifications.html.erb +++ b/app/views/users/_mail_notifications.html.erb @@ -11,12 +11,13 @@ <%= render_project_nested_lists(@user.projects) do |project| content_tag('label', check_box_tag( - 'notified_project_ids[]', + 'user[notified_project_ids][]', project.id, @user.notified_projects_ids.include?(project.id) ) + ' ' + h(project.name) ) end %> + <%= hidden_field_tag 'user[notified_project_ids][]', '' %> <p><em class="info"><%= l(:text_user_mail_option) %></em></p> <% end %> |