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

Fix issue with settings

Browse Source
This commit is contained in:
Alexander Meindl
2017-10-10 18:56:15 +02:00
parent 2c3b503f68
commit 2a1672f024
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine_messenger.rb
View File

@@ -11,7 +11,7 @@ Rails.configuration.to_prepare do
ActionController::Parameters.new(Setting[:plugin_redmine_messenger])
end
def setting?(value)
def self.setting?(value)
return true if settings[value].to_i == 1
end
end

15
lib/redmine_messenger/patches/issue_patch.rb
View File

@@ -49,7 +49,7 @@ module RedmineMessenger
Messenger.speak(l(:label_messenger_issue_created,
project_url: "<#{Messenger.object_url project}|#{ERB::Util.html_escape(project)}>",
url: "<#{Messenger.object_url(self)}|#{ERB::Util.html_escape(self)}>#{Messenger.mentions(project, description) if Messenger.setting_for_project(project, :auto_mentions) or not Messenger.textfield_for_project(project, :default_mentions).empty? }",
url: send_messenger_mention_url(project, description),
user: author),
channels, url, attachment: attachment, project: project)
end
@@ -75,10 +75,21 @@ module RedmineMessenger
Messenger.speak(l(:label_messenger_issue_updated,
project_url: "<#{Messenger.object_url project}|#{ERB::Util.html_escape(project)}>",
url: "<#{Messenger.object_url self}|#{ERB::Util.html_escape(self)}>#{Messenger.mentions(project, current_journal.notes) if Messenger.setting_for_project(project, :auto_mentions) or not Messenger.textfield_for_project(project, :default_mentions).empty? }",
url: send_messenger_mention_url(project, current_journal.notes),
user: current_journal.user),
channels, url, attachment: attachment, project: project)
end
private
def send_messenger_mention_url(project, text)
mention_to = ''
if Messenger.setting_for_project(project, :auto_mentions) ||
Messenger.textfield_for_project(project, :default_mentions).present?
mention_to = Messenger.mentions(project, text)
end
"<#{Messenger.object_url(self)}|#{ERB::Util.html_escape(self)}>#{mention_to}"
end
end
end
end