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

slim templates, subdirectory bug fixed #9, other solution of #12 included

Browse Source
This commit is contained in:
Alexander Meindl
2018-01-24 12:03:28 +01:00
parent c16dec39e4
commit 593d7055e0
17 changed files with 278 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,19 +25,17 @@ module RedmineMessenger
if description.present? && Messenger.setting_for_project(project, :new_include_description)
attachment[:text] = ERB::Util.html_escape(description)
end
attachment[:fields] = [{
title: I18n.t(:field_status),
value: ERB::Util.html_escape(status.to_s),
short: true
}, {
title: I18n.t(:field_priority),
value: ERB::Util.html_escape(priority.to_s),
short: true
}, {
title: I18n.t(:field_assigned_to),
value: ERB::Util.html_escape(assigned_to.to_s),
short: true
}]
attachment[:fields] = [{ title: I18n.t(:field_status),
value: ERB::Util.html_escape(status.to_s),
short: true },
{ title: I18n.t(:field_priority),
value: ERB::Util.html_escape(priority.to_s),
short: true }]
if assigned_to.present?
attachment[:fields] << { title: I18n.t(:field_assigned_to),
value: ERB::Util.html_escape(assigned_to.to_s),
short: true }
end
if RedmineMessenger.setting?(:display_watchers)
attachment[:fields] << {
@@ -70,7 +68,23 @@ module RedmineMessenger
if current_journal.notes.present? && Messenger.setting_for_project(project, :updated_include_description)
attachment[:text] = ERB::Util.html_escape(current_journal.notes)
end
fields = current_journal.details.map { |d| Messenger.detail_to_field d }
if status_id != status_id_was
fields << { title: I18n.t(:field_status),
value: ERB::Util.html_escape(status.to_s),
short: true }
end
if priority_id != priority_id_was
fields << { title: I18n.t(:field_priority),
value: ERB::Util.html_escape(priority.to_s),
short: true }
end
if assigned_to.present?
fields << { title: I18n.t(:field_assigned_to),
value: ERB::Util.html_escape(assigned_to.to_s),
short: true }
end
attachment[:fields] = fields if fields.any?
Messenger.speak(l(:label_messenger_issue_updated,

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

@@ -53,6 +53,4 @@ module RedmineMessenger
end
end
unless Issue.included_modules.include? RedmineMessenger::Patches::IssuePatch
Issue.send(:include, RedmineMessenger::Patches::IssuePatch)
end
Issue.send(:include, RedmineMessenger::Patches::IssuePatch) unless Issue.included_modules.include? RedmineMessenger::Patches::IssuePatch