diff --git a/app/views/settings/_mattermost_settings.html.erb b/app/views/settings/_mattermost_settings.html.erb index b2e802c..8f1d06f 100644 --- a/app/views/settings/_mattermost_settings.html.erb +++ b/app/views/settings/_mattermost_settings.html.erb @@ -40,6 +40,16 @@ />

+

+ + /> +

+ +

+ + /> +

+

/> diff --git a/init.rb b/init.rb index d92eae2..e65108f 100644 --- a/init.rb +++ b/init.rb @@ -18,7 +18,10 @@ Redmine::Plugin.register :redmine_mattermost do 'channel' => nil, 'icon' => 'https://raw.githubusercontent.com/altsol/redmine_mattermost/assets/icon.png', 'username' => 'redmine', - 'display_watchers' => 'no' + 'display_watchers' => 'no', + 'post_updates' => '1', + 'post_private_issues' => '1', + 'post_private_notes' => '1' }, :partial => 'settings/mattermost_settings' end diff --git a/lib/redmine_mattermost/listener.rb b/lib/redmine_mattermost/listener.rb index e55f6b3..d9b2082 100644 --- a/lib/redmine_mattermost/listener.rb +++ b/lib/redmine_mattermost/listener.rb @@ -8,7 +8,7 @@ class MattermostListener < Redmine::Hook::Listener url = url_for_project issue.project return unless channels.any? and url - return if issue.is_private? + return if issue.is_private? and Setting.plugin_redmine_mattermost[:post_private_issues] != '1' msg = "[#{escape issue.project}] #{escape issue.author} created <#{object_url issue}|#{escape issue}>#{mentions issue.description}" @@ -45,8 +45,8 @@ class MattermostListener < Redmine::Hook::Listener url = url_for_project issue.project return unless channels.any? and url and Setting.plugin_redmine_mattermost[:post_updates] == '1' - return if issue.is_private? - return if journal.private_notes? + return if issue.is_private? and Setting.plugin_redmine_mattermost[:post_private_issues] != '1' + return if journal.private_notes? and Setting.plugin_redmine_mattermost[:post_private_notes] != '1' msg = "[#{escape issue.project}] #{escape journal.user.to_s} updated <#{object_url issue}|#{escape issue}>#{mentions journal.notes}" @@ -66,7 +66,7 @@ class MattermostListener < Redmine::Hook::Listener url = url_for_project issue.project return unless channels.any? and url and issue.save - return if issue.is_private? + return if issue.is_private? and Setting.plugin_redmine_mattermost[:post_private_issues] != '1' msg = "[#{escape issue.project}] #{escape journal.user.to_s} updated <#{object_url issue}|#{escape issue}>"