From 58b4a890ca733ce3b14ee5fe91ec5b330f3a83bb Mon Sep 17 00:00:00 2001 From: Alexander Meindl Date: Mon, 10 Sep 2018 17:45:53 +0200 Subject: [PATCH] Fix new coding standards --- app/models/messenger.rb | 11 +++++++++++ lib/redmine_messenger.rb | 1 + lib/redmine_messenger/patches/contact_patch.rb | 4 ++++ lib/redmine_messenger/patches/db_entry_patch.rb | 3 +++ lib/redmine_messenger/patches/password_patch.rb | 3 +++ lib/redmine_messenger/patches/wiki_page_patch.rb | 3 +++ test/support/additional_environment.rb | 1 - 7 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/models/messenger.rb b/app/models/messenger.rb index 6bb8585..429c5de 100644 --- a/app/models/messenger.rb +++ b/app/models/messenger.rb @@ -73,22 +73,27 @@ class Messenger def self.url_for_project(proj) return if proj.blank? + # project based pm = MessengerSetting.find_by(project_id: proj.id) return pm.messenger_url if !pm.nil? && pm.messenger_url.present? + # parent project based parent_url = url_for_project(proj.parent) return parent_url if parent_url.present? # system based return RedmineMessenger.settings[:messenger_url] if RedmineMessenger.settings[:messenger_url].present? + nil end def self.textfield_for_project(proj, config) return if proj.blank? + # project based pm = MessengerSetting.find_by(project_id: proj.id) return pm.send(config) if !pm.nil? && pm.send(config).present? + default_textfield(proj, config) end @@ -97,15 +102,18 @@ class Messenger parent_field = textfield_for_project(proj.parent, config) return parent_field if parent_field.present? return RedmineMessenger.settings[config] if RedmineMessenger.settings[config].present? + '' end def self.channels_for_project(proj) return [] if proj.blank? + # project based pm = MessengerSetting.find_by(project_id: proj.id) if !pm.nil? && pm.messenger_channel.present? return [] if pm.messenger_channel == '-' + return pm.messenger_channel.split(',').map(&:strip).uniq end default_project_channels(proj) @@ -120,11 +128,13 @@ class Messenger RedmineMessenger.settings[:messenger_channel] != '-' return RedmineMessenger.settings[:messenger_channel].split(',').map(&:strip).uniq end + [] end def self.setting_for_project(proj, config) return false if proj.blank? + @setting_found = 0 # project based pm = MessengerSetting.find_by(project_id: proj.id) @@ -144,6 +154,7 @@ class Messenger end # system based return true if RedmineMessenger.settings[config].present? && RedmineMessenger.setting?(config) + false end diff --git a/lib/redmine_messenger.rb b/lib/redmine_messenger.rb index bd53a6e..bece99e 100644 --- a/lib/redmine_messenger.rb +++ b/lib/redmine_messenger.rb @@ -11,6 +11,7 @@ Rails.configuration.to_prepare do def self.setting?(value) return true if settings[value].to_i == 1 + false end end diff --git a/lib/redmine_messenger/patches/contact_patch.rb b/lib/redmine_messenger/patches/contact_patch.rb index 91f9551..eb874d3 100644 --- a/lib/redmine_messenger/patches/contact_patch.rb +++ b/lib/redmine_messenger/patches/contact_patch.rb @@ -13,12 +13,14 @@ module RedmineMessenger def send_messenger_create return unless Messenger.setting_for_project(project, :post_contact) return if is_private? && !Messenger.setting_for_project(project, :post_private_contacts) + set_language_if_valid Setting.default_language channels = Messenger.channels_for_project project url = Messenger.url_for_project project return unless channels.present? && url + Messenger.speak(l(:label_messenger_contact_created, project_url: "<#{Messenger.object_url project}|#{ERB::Util.html_escape(project)}>", url: "<#{Messenger.object_url self}|#{name}>", @@ -29,12 +31,14 @@ module RedmineMessenger def send_messenger_update return unless Messenger.setting_for_project(project, :post_contact_updates) return if is_private? && !Messenger.setting_for_project(project, :post_private_contacts) + set_language_if_valid Setting.default_language channels = Messenger.channels_for_project project url = Messenger.url_for_project project return unless channels.present? && url + Messenger.speak(l(:label_messenger_contact_updated, project_url: "<#{Messenger.object_url project}|#{ERB::Util.html_escape(project)}>", url: "<#{Messenger.object_url self}|#{name}>", diff --git a/lib/redmine_messenger/patches/db_entry_patch.rb b/lib/redmine_messenger/patches/db_entry_patch.rb index 68a31cf..6f55fae 100644 --- a/lib/redmine_messenger/patches/db_entry_patch.rb +++ b/lib/redmine_messenger/patches/db_entry_patch.rb @@ -20,6 +20,7 @@ module RedmineMessenger url = Messenger.url_for_project project return unless channels.present? && url + Messenger.speak(l(:label_messenger_db_entry_created, project_url: "<#{Messenger.object_url project}|#{ERB::Util.html_escape(project)}>", url: "<#{Messenger.object_url self}|#{name}>", @@ -30,12 +31,14 @@ module RedmineMessenger def send_messenger_update return unless Messenger.setting_for_project(project, :post_db_updates) return if is_private? && !Messenger.setting_for_project(project, :post_private_db) + set_language_if_valid Setting.default_language channels = Messenger.channels_for_project project url = Messenger.url_for_project project return unless channels.present? && url + Messenger.speak(l(:label_messenger_db_entry_updated, project_url: "<#{Messenger.object_url project}|#{ERB::Util.html_escape(project)}>", url: "<#{Messenger.object_url self}|#{name}>", diff --git a/lib/redmine_messenger/patches/password_patch.rb b/lib/redmine_messenger/patches/password_patch.rb index 83faebe..31c855e 100644 --- a/lib/redmine_messenger/patches/password_patch.rb +++ b/lib/redmine_messenger/patches/password_patch.rb @@ -13,6 +13,7 @@ module RedmineMessenger def send_messenger_create return unless Messenger.setting_for_project(project, :post_password) return if is_private? + set_language_if_valid Setting.default_language channels = Messenger.channels_for_project project @@ -30,12 +31,14 @@ module RedmineMessenger def send_messenger_update return unless Messenger.setting_for_project(project, :post_password_updates) return if is_private? + set_language_if_valid Setting.default_language channels = Messenger.channels_for_project project url = Messenger.url_for_project project return unless channels.present? && url + Messenger.speak(l(:label_messenger_password_updated, project_url: "<#{Messenger.object_url project}|#{ERB::Util.html_escape(project)}>", url: "<#{Messenger.object_url self}|#{name}>", diff --git a/lib/redmine_messenger/patches/wiki_page_patch.rb b/lib/redmine_messenger/patches/wiki_page_patch.rb index 05720b7..5288bac 100644 --- a/lib/redmine_messenger/patches/wiki_page_patch.rb +++ b/lib/redmine_messenger/patches/wiki_page_patch.rb @@ -12,12 +12,14 @@ module RedmineMessenger module InstanceMethods def send_messenger_create return unless Messenger.setting_for_project(project, :post_wiki) + set_language_if_valid Setting.default_language channels = Messenger.channels_for_project project url = Messenger.url_for_project project return unless channels.present? && url + Messenger.speak(l(:label_messenger_wiki_created, project_url: "<#{Messenger.object_url project}|#{ERB::Util.html_escape(project)}>", url: "<#{Messenger.object_url self}|#{title}>", @@ -27,6 +29,7 @@ module RedmineMessenger def send_messenger_update return unless Messenger.setting_for_project(project, :post_wiki_updates) + set_language_if_valid Setting.default_language channels = Messenger.channels_for_project project diff --git a/test/support/additional_environment.rb b/test/support/additional_environment.rb index 2beb3d1..0b0cde6 100644 --- a/test/support/additional_environment.rb +++ b/test/support/additional_environment.rb @@ -2,4 +2,3 @@ # config.logger = Logger.new(STDOUT) # config.logger.level = Logger::INFO # config.log_level = :info -