SW/redmine
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix new coding standards

Browse Source
This commit is contained in:
Alexander Meindl
2018-09-10 17:45:53 +02:00
parent 94212d2f3d
commit 58b4a890ca
7 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/messenger.rb
View File

@@ -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

1
lib/redmine_messenger.rb
View File

@@ -11,6 +11,7 @@ Rails.configuration.to_prepare do
def self.setting?(value)
return true if settings[value].to_i == 1
false
end
end

4
lib/redmine_messenger/patches/contact_patch.rb
View File

@@ -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}>",

3
lib/redmine_messenger/patches/db_entry_patch.rb
View File

@@ -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}>",

3
lib/redmine_messenger/patches/password_patch.rb
View File

@@ -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}>",

3
lib/redmine_messenger/patches/wiki_page_patch.rb
View File

@@ -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

1
test/support/additional_environment.rb
View File

@@ -2,4 +2,3 @@
# config.logger = Logger.new(STDOUT)
# config.logger.level = Logger::INFO
# config.log_level = :info