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

Fix coding standards

Browse Source
This commit is contained in:
Alexander Meindl
2020-08-30 17:27:05 +02:00
parent 61f54fce26
commit cb23763b63
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/messenger_settings/_show.html.slim
View File

@@ -27,7 +27,6 @@
= render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :messenger_channel, size: 30 }
= render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :messenger_username, size: 30 }
= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :messenger_verify_ssl }
= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :messenger_direct_users_messages }
fieldset#messenger_settings.box.tabular
legend = l(:label_issue_plural)
@@ -41,6 +40,7 @@
= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :updated_include_description }
= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_issues }
= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_notes }
= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :messenger_direct_users_messages }
fieldset#messenger_settings.box.tabular
legend = l(:label_wiki)

9
app/views/settings/_messenger_settings.html.slim
View File

@@ -21,10 +21,6 @@ fieldset#messenger_settings.box.tabular
= tag.label l(:label_settings_messenger_verify_ssl)
= check_box_tag 'settings[messenger_verify_ssl]', 1, @settings[:messenger_verify_ssl].to_i == 1
em.info = t(:messenger_verify_ssl_info_html)
p
= tag.label l(:label_settings_messenger_direct_users_messages)
= check_box_tag 'settings[messenger_direct_users_messages]', 1, @settings[:messenger_direct_users_messages].to_i == 1
em.info = t(:messenger_direct_users_messages_info_html)
fieldset#messenger_settings.box.tabular
legend = l(:label_issue_plural)
@@ -56,6 +52,11 @@ fieldset#messenger_settings.box.tabular
= tag.label l(:label_settings_post_private_notes)
= check_box_tag 'settings[post_private_notes]', 1, @settings[:post_private_notes].to_i == 1
p
= tag.label l(:label_settings_messenger_direct_users_messages)
= check_box_tag 'settings[messenger_direct_users_messages]', 1, @settings[:messenger_direct_users_messages].to_i == 1
em.info = t(:messenger_direct_users_messages_info_html)
fieldset#messenger_settings.box.tabular
legend = l(:label_wiki)
.info = t(:messenger_wiki_intro)

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

@@ -16,9 +16,7 @@ module RedmineMessenger
url = Messenger.url_for_project project
if Messenger.setting_for_project(project, :messenger_direct_users_messages)
to_be_notified = notified_users + watcher_users
to_be_notified = to_be_notified.compact.uniq
to_be_notified.each do |user|
messenger_to_be_notified.each do |user|
channels.append "@#{user.login}" if user.login != author.login
end
end
@@ -72,9 +70,7 @@ module RedmineMessenger
url = Messenger.url_for_project project
if Messenger.setting_for_project(project, :messenger_direct_users_messages)
to_be_notified = notified_users + watcher_users
to_be_notified = to_be_notified.compact.uniq
to_be_notified.each do |user|
messenger_to_be_notified.each do |user|
channels.append "@#{user.login}" if user.login != current_journal.user.login
end
end
@@ -105,6 +101,11 @@ module RedmineMessenger
private
def messenger_to_be_notified
to_be_notified = (notified_users + watcher_users).compact
to_be_notified.uniq
end
def send_messenger_mention_url(project, text)
mention_to = ''
if Messenger.setting_for_project(project, :auto_mentions) ||