db/migrate/005_change_messenger_notification_column.rb lib/redmine_messenger/mailer.rb @@ -8,15 +8,7 @@ module UserMessengerHelper name = l("default_issue_status_#{name}".to_sym).downcase if l_has_string?("default_issue_status_#{name}".to_sym) options << [name, x.id] end - options - - - - + options end - def notification_to_select - UserMessenger::NOTIFICATION.collect { |x| [l("field_messenger_notifications_#{x}".to_sym), x] } - end - end app/helpers/user_messenger_helper.rb @@ -1,7 +1,5 @@ class UserMessenger < ActiveRecord::Base - NOTIFICATION = %w( mail mail_messenger_title mail_messenger_full messenger_full ) - belongs_to :user belongs_to :issue belongs_to :issue_status_when_starting_timer, :class_name => "IssueStatus", :foreign_key => "issue_status_when_starting_timer_id" @@ -9,25 +7,12 @@ class UserMessenger < ActiveRecord::Base belongs_to :issue_status_when_finishing_timer_with_full_ratio, :class_name => "IssueStatus", :foreign_key => "issue_status_when_finishing_timer_with_full_ratio_id" validates_presence_of :messenger_id, :user - validates_inclusion_of :messenger_notifications, :in => NOTIFICATION # Returns false if this user hasn't been verified yet -- that is, a verification code is not nil. def verified? verification_code.nil? end - def receive_mail_notification? - self.messenger_notifications != "messenger_full" - end - - def receive_full_messenger_notification? - self.messenger_notifications == "mail_messenger_full" or self.messenger_notifications == "messenger_full" - end - - def receive_title_messenger_notification? - self.messenger_notifications == "mail_messenger_title" - end - def language unless self.user.language.blank? self.user.language app/models/user_messenger.rb @@ -14,7 +14,7 @@ <p><%= f.select :issue_status_when_finishing_timer_with_full_ratio_id, issue_status_to_select %></p> <p><%= f.check_box :resume_when_become_online %></p> <p><%= f.check_box :pause_when_become_offline_or_away %></p> - <p><%= f.select :messenger_notifications, notification_to_select %></p> + <p><%= f.check_box :messenger_notifications %></p> <p><%= f.check_box :assigning_issue_when_starting_timer %></p> </div> <%= submit_tag l(:button_save) %> app/views/user_messenger/index.rhtml @@ -10,6 +10,8 @@ require_dependency 'redmine_messenger/messengers/mock_messenger' require_dependency 'redmine_messenger/messengers/xmpp4r_messenger' require_dependency 'redmine_messenger/base' require_dependency 'redmine_messenger/command' +require_dependency 'app/models/mailer' +require_dependency 'redmine_messenger/mailer' Dir[File.join(File.dirname(__FILE__), "app/messengers/*.rb")].each do |file| require_dependency file init.rb @@ -12,13 +12,8 @@ field_pause_when_become_offline_or_away: Resume timer when become offline/away field_issue_status_when_starting_timer: Status when starting timer field_issue_status_when_finishing_timer: Status when finishing timer field_issue_status_when_finishing_timer_with_full_ratio: Status when finishing timer with ratio 100%% -field_messenger_notifications: System notification -field_messenger_notifications_mail: only mail -field_messenger_notifications_mail_messenger_title: mail and title in messenger -field_messenger_notifications_mail_messenger_full: mail and messenger -field_messenger_notifications_messenger_full: only messenger - -field_assigning_issue_when_starting_timer: Assigning issue when starting timer +field_messenger_notifications: Notification via messenger +field_assigning_issue_when_starting_timer: Assign issue when starting timer messenger_welcome_message: Your JID has been registered at Redmine Messenger. Please add this contact to your list and send your verification code. lang/en.yml @@ -12,11 +12,7 @@ field_pause_when_become_offline_or_away: Zatrzymaj licznik jeśli status zmieni field_issue_status_when_starting_timer: Zmień status jeśli licznik został włączony field_issue_status_when_finishing_timer: Zmień status jeśli licznik został wyłączony field_issue_status_when_finishing_timer_with_full_ratio: Zmień status jeśli licznik został wyłączony i ratio wynosi 100%% -field_messenger_notifications: Powiadomienia z systemu -field_messenger_notifications_mail: tylko mailem -field_messenger_notifications_mail_messenger_title: mailem i tytuł komunikatorem -field_messenger_notifications_mail_messenger_full: mailem i komunikatorem -field_messenger_notifications_messenger_full: tylko komunikatorem +field_messenger_notifications: Powiadomienia komunikatorem field_assigning_issue_when_starting_timer: Przypisz zagadnienie jeśli licznik został uruchomiony messenger_welcome_message: Twój JID został zarejestrowany Redmine Messenger. Dodaj ten kontakt do swojej listy i wyślij swój kod weryfikacyjny. lang/pl.yml 37d30c18848a2c881ca2cb277c442af6addf6d55 Maciej Szczytowski mszczytowski@gmail.com http://github.com/mszczytowski/redmine_messenger/commit/33f71b533a84f2720697ca869564d1bc2abb7330 33f71b533a84f2720697ca869564d1bc2abb7330 2008-11-06T09:29:12-08:00 2008-11-06T09:29:12-08:00 notification via messenger 99b52ae14ea666f4f15d580aca1e99030eaf917c Maciej Szczytowski mszczytowski@gmail.com