jro_apps/redmine Commit - r4102:0316af7f6bfa

Converted User#mail_notification from a boolean to a string....

Eric Davis -

r4102:0316af7f6bfa

parent child

Context file:

r4102:0316af7f6bfa

Collapse all files

db/migrate/20100129193402_change_users_mail_notification_to_string.rb created 644 +9 0

			@@ -0,0 +1,9
		1	class ChangeUsersMailNotificationToString < ActiveRecord::Migration
		2	def self.up
		3	change_column :users, :mail_notification, :string, :default => '', :null => false
		4	end
		5
		6	def self.down
		7	change_column :users, :mail_notification, :boolean, :default => true, :null => false
		8	end
		9	end

db/migrate/20100129193813_update_mail_notification_values.rb created 644 +11 0

			@@ -0,0 +1,11
		1	# Patch the data from a boolean change.
		2	class UpdateMailNotificationValues < ActiveRecord::Migration
		3	def self.up
		4	User.update_all("mail_notification = 'all'", "mail_notification = '1'")
		5	User.update_all("mail_notification = 'only_my_events'", "mail_notification = '0'")
		6	end
		7
		8	def self.down
		9	# No-op
		10	end
		11	end

app/controllers/my_controller.rb +8 -6

                  @pref = @user.pref
                  if request.post?
                    @user.attributes = params[:user]
-                   @user.mail_notification = (params[:notification_option] == 'all')
+                   @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
                      return
                    end
                  end
-                 @notification_options = [[l(:label_user_mail_option_all), 'all'],
-                                          [l(:label_user_mail_option_none), 'none']]
+                 @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
-                 @notification_options.insert 1, [l(:label_user_mail_option_selected), 'selected'] if @user.memberships.length > 1
-                 @notification_option = @user.mail_notification? ? 'all' : (@user.notified_projects_ids.empty? ? 'none' : 'selected')
+                 # 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 #? ? 'all' : (@user.notified_projects_ids.empty? ? 'none' : 'selected')
                end
                # Manage user's password

app/models/project.rb +1 -1

                # Returns the mail adresses of users that should be always notified on project events
                def recipients
-                 members.select {|m| m.mail_notification? || m.user.mail_notification?}.collect {|m| m.user.mail}
+                 members.select {|m| m.mail_notification? || m.user.mail_notification == 'all'}.collect {|m| m.user.mail}
                end
                # Returns the users that should be notified on project events

app/models/user.rb +10 -1

                  :username => '#{login}'
                }
+               MAIL_NOTIFICATION_OPTIONS = [
+                                            [:all, :label_user_mail_option_all],
+                                            [:selected, :label_user_mail_option_selected],
+                                            [:none, :label_user_mail_option_none],
+                                            [:only_my_events, :label_user_mail_option_only_my_events],
+                                            [:only_assigned, :label_user_mail_option_only_assigned],
+                                            [:only_owner, :label_user_mail_option_only_owner]
+                                           ]
                has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
                                                 :after_remove => Proc.new {|user, group| group.user_removed(user)}
                has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
                validates_confirmation_of :password, :allow_nil => true
                def before_create
-                 self.mail_notification = false
+                 self.mail_notification = 'only_my_events'
                  true
                end

app/views/my/account.rhtml +1 -1

              <div class="splitcontentright">
              <h3><%=l(:field_mail_notification)%></h3>
              <div class="box">
-             <%= select_tag 'notification_option', options_for_select(@notification_options, @notification_option),
+             <%= select_tag 'notification_option', options_for_select(@notification_options.collect {|o| [l(o.last), o.first]}, @notification_option.to_sym),
                                                    :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| %>

config/locales/en.yml +4 -1

                label_search_titles_only: Search titles only
                label_user_mail_option_all: "For any event on all my projects"
                label_user_mail_option_selected: "For any event on the selected projects only..."
-               label_user_mail_option_none: "Only for things I watch or I'm involved in"
+               label_user_mail_option_none: "No events"
+               label_user_mail_option_only_my_events: "Only for things I watch or I'm involved in"
+               label_user_mail_option_only_assigned: "Only for things I am assigned to"
+               label_user_mail_option_only_owner: "Only for things I am the owner of"
                label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
                label_registration_activation_by_email: account activation by email
                label_registration_manual_activation: manual account activation

test/fixtures/users.yml +10 -10

                firstname: Robert
                id: 4
                auth_source_id:
-               mail_notification: true
+               mail_notification: all
                login: rhill
                type: User
              users_001:
                firstname: redMine
                id: 1
                auth_source_id:
-               mail_notification: true
+               mail_notification: all
                login: admin
                type: User
              users_002:
                firstname: John
                id: 2
                auth_source_id:
-               mail_notification: true
+               mail_notification: all
                login: jsmith
                type: User
              users_003:
                firstname: Dave
                id: 3
                auth_source_id:
-               mail_notification: true
+               mail_notification: all
                login: dlopper
                type: User
              users_005:
                lastname: Lopper2
                firstname: Dave2
                auth_source_id:
-               mail_notification: true
+               mail_notification: all
                login: dlopper2
                type: User
              users_006:
                lastname: Anonymous
                firstname: ''
                auth_source_id:
-               mail_notification: false
+               mail_notification: only_my_events
                login: ''
                type: AnonymousUser
              users_007:
                lastname: One
                firstname: Some
                auth_source_id:
-               mail_notification: false
+               mail_notification: only_my_events
                login: someone
                type: User
              users_008:
                lastname: Misc
                firstname: User
                auth_source_id:
-               mail_notification: false
+               mail_notification: only_my_events
                login: miscuser8
                type: User
              users_009:
                lastname: Misc
                firstname: User
                auth_source_id:
-               mail_notification: false
+               mail_notification: only_my_events
                login: miscuser9
                type: User
              groups_010:
                lastname: B Team
                type: Group
-  No newline at end of file

test/unit/user_test.rb +4 -4

                end
                def test_mail_notification_all
-                 @jsmith.mail_notification = true
+                 @jsmith.mail_notification = 'all'
                  @jsmith.notified_project_ids = []
                  @jsmith.save
                  @jsmith.reload
                end
                def test_mail_notification_selected
-                 @jsmith.mail_notification = false
+                 @jsmith.mail_notification = 'selected'
                  @jsmith.notified_project_ids = [1]
                  @jsmith.save
                  @jsmith.reload
                  assert Project.find(1).recipients.include?(@jsmith.mail)
                end
-               def test_mail_notification_none
-                 @jsmith.mail_notification = false
+               def test_mail_notification_only_my_events
+                 @jsmith.mail_notification = 'only_my_events'
                  @jsmith.notified_project_ids = []
                  @jsmith.save
                  @jsmith.reload

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