diff --git a/CHANGELOG.md b/CHANGELOG.md
index a234221..065a966 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,46 +1,60 @@
Changelog
=========
-## 1.0.1
+1.0.2
+-----
-* Japanese translation has been added - thanks @Yoto
-* Default mentions has been added - thanks @xstasi
+- Bug fixed with issue urls, if Redmine is in subdirectory
+- slim is used as template engine
-## 1.0.0
+1.0.1
+-----
-* Redmine 3.4.x compatibility
-* Commit message issue bug fix
-* Some code cleanups
+- Japanese translation has been added - thanks @Yoto
+- Default mentions has been added - thanks @xstasi
-## 0.9.9
+1.0.0
+-----
-* All global messenger settings can be overwritten project based
-* Locale support added
-* Wiki added supported for notification
-* Contact added/updated supported for notification (if redmine_contacts is installed)
-* Password added/updated supported for notification (if redmine_passwords is installed)
-* DB entry added/updated supported for notification (if redmine_db is installed)
-* SSL verify can be disabled
-* Lots of refactoring and code cleanups
-* Swith from httpclient to net/http
-* Fork of redmine_rocketchat, redmine_slack and redmine_mattermost (base functions for all three messenger)
+- Redmine 3.4.x compatibility
+- Commit message issue bug fix
+- Some code cleanups
-## v0.6.1
+0.9.9
+-----
+
+- All global messenger settings can be overwritten project based
+- Locale support added
+- Wiki added supported for notification
+- Contact added/updated supported for notification (if redmine_contacts is installed)
+- Password added/updated supported for notification (if redmine_passwords is installed)
+- DB entry added/updated supported for notification (if redmine_db is installed)
+- SSL verify can be disabled
+- Lots of refactoring and code cleanups
+- Swith from httpclient to net/http
+- Fork of redmine_rocketchat, redmine_slack and redmine_mattermost (base functions for all three messenger)
+
+v0.6.1
+------
unknown changes
-## v0.4
+v0.4
+----
unknown changes
-## v0.3
+v0.3
+----
unknown changes
-## v0.2
+v0.2
+----
unknown changes
-## v0.1
+v0.1
+----
unknown changes
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..8c3b5db
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1 @@
+gem 'slim-rails'
diff --git a/README.md b/README.md
index a1cf40c..5f78f69 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,12 @@
-# Messenger plugin for Redmine
+Messenger plugin for Redmine
+============================
This plugin posts updates to issues in your Redmine installation to [Slack](https://slack.com/), [Rocket.Chat](https://rocket.chat/) or [Mattermost](https://about.mattermost.com/) channel.
[](https://gemnasium.com/github.com/AlphaNodes/redmine_messenger) 
-## Features
+Features
+--------
* Post information to messenger channel
* post issue updates
@@ -19,7 +21,8 @@ This plugin posts updates to issues in your Redmine installation to [Slack](http
* parent project support (inherit messenger settings from parent project)
* multiple channel support (define one or more channels to deliver note)
-## Screenshot
+Screenshot
+----------
Mattermost output:
@@ -29,7 +32,8 @@ Redmine configuration:
-## Prepare your messenger service
+Prepare your messenger service
+------------------------------
### Slack
@@ -44,18 +48,21 @@ Go to Mattermost documentation [Incoming Webhooks](https://docs.mattermost.com/d
Go to Rocket.Chat documentation [Incoming WebHook Scripting](https://rocket.chat/docs/administrator-guides/integrations/) for more information to set up Incoming WebHook
-## Requirements
+Requirements
+------------
* Redmine version >= 3.0.0
* Ruby version >= 2.1.5
-## Installation
+Installation
+------------
Install ``redmine_messenger`` plugin for `Redmine`
cd $REDMINE_ROOT
git clone git://github.com/alphanodes/redmine_messenger.git plugins/redmine_messenger
+ bundle install --without development test
bundle exec rake redmine:plugins:migrate RAILS_ENV=production
Restart Redmine (application server) and you should see the plugin show up in the Plugins page.
@@ -66,7 +73,8 @@ visible to users, you can find each channel's handle by navigating inside the ch
and clicking the down-arrow and selecting view info).
-## Uninstall
+Uninstall
+---------
Uninstall ``redmine_messenger``
@@ -77,7 +85,8 @@ Uninstall ``redmine_messenger``
Restart Redmine (application server)
-## Credits
+Credits
+-------
The source code is forked from
diff --git a/app/models/messenger.rb b/app/models/messenger.rb
index 4143f85..cf87fb4 100644
--- a/app/models/messenger.rb
+++ b/app/models/messenger.rb
@@ -4,6 +4,10 @@ require 'net/http'
class Messenger
include Redmine::I18n
+ def self.default_url_options
+ { only_path: true, script_name: Redmine::Utils.relative_url_root }
+ end
+
def self.speak(msg, channels, url, options)
url ||= RedmineMessenger.settings[:messenger_url]
@@ -32,18 +36,14 @@ class Messenger
uri = URI(url)
params[:channel] = channel
http_options = { use_ssl: uri.scheme == 'https' }
- unless RedmineMessenger.setting?(:messenger_verify_ssl)
- http_options[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
- end
+ http_options[:verify_mode] = OpenSSL::SSL::VERIFY_NONE unless RedmineMessenger.setting?(:messenger_verify_ssl)
begin
req = Net::HTTP::Post.new(uri)
req.set_form_data(payload: params.to_json)
Net::HTTP.start(uri.hostname, uri.port, http_options) do |http|
response = http.request(req)
- unless [Net::HTTPSuccess, Net::HTTPRedirection, Net::HTTPOK].include? response
- Rails.logger.warn(response)
- end
+ Rails.logger.warn(response) unless [Net::HTTPSuccess, Net::HTTPRedirection, Net::HTTPOK].include? response
end
rescue StandardError => e
Rails.logger.warn("cannot connect to #{url}")
@@ -53,13 +53,13 @@ class Messenger
end
def self.object_url(obj)
- if Setting.host_name.to_s =~ %r{/\A(https?\:\/\/)?(.+?)(\:(\d+))?(\/.+)?\z/i}
+ if Setting.host_name.to_s =~ %r{\A(https?\://)?(.+?)(\:(\d+))?(/.+)?\z}i
host = Regexp.last_match(2)
port = Regexp.last_match(4)
prefix = Regexp.last_match(5)
Rails.application.routes.url_for(obj.event_url(host: host, protocol: Setting.protocol, port: port, script_name: prefix))
else
- Rails.application.routes.url_for(obj.event_url(host: Setting.host_name, protocol: Setting.protocol))
+ Rails.application.routes.url_for(obj.event_url(host: Setting.host_name, protocol: Setting.protocol, script_name: ''))
end
end
@@ -88,9 +88,7 @@ class Messenger
# parent project based
parent_field = textfield_for_project(proj.parent, config)
return parent_field if parent_field.present?
- if RedmineMessenger.settings[config].present?
- return RedmineMessenger.settings[config]
- end
+ return RedmineMessenger.settings[config] if RedmineMessenger.settings[config].present?
''
end
diff --git a/app/models/messenger_setting.rb b/app/models/messenger_setting.rb
index 6b89312..d5eef72 100644
--- a/app/models/messenger_setting.rb
+++ b/app/models/messenger_setting.rb
@@ -28,27 +28,7 @@ class MessengerSetting < ActiveRecord::Base
'post_password',
'post_password_updates'
- attr_accessible :messenger_url,
- :messenger_icon,
- :messenger_channel,
- :messenger_username,
- :messenger_verify_ssl,
- :auto_mentions,
- :default_mentions,
- :display_watchers,
- :post_updates,
- :new_include_description,
- :updated_include_description,
- :post_private_issues,
- :post_private_notes,
- :post_wiki,
- :post_wiki_updates,
- :post_db,
- :post_db_updates,
- :post_contact,
- :post_contact_updates,
- :post_password,
- :post_password_updates
+ attr_protected :id
def self.find_or_create(p_id)
setting = MessengerSetting.find_by(project_id: p_id)
diff --git a/app/views/messenger_settings/_messenger_select.html.erb b/app/views/messenger_settings/_messenger_select.html.erb
deleted file mode 100644
index bd82149..0000000
--- a/app/views/messenger_settings/_messenger_select.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-
- <%= f.select mf, project_messenger_options(@messenger_setting.send(mf)), label: l("label_settings_#{mf}") %>
- <%= l(:label_default) %>: <%= project_setting_messenger_default_value(mf) %>
-
diff --git a/app/views/messenger_settings/_messenger_select.html.slim b/app/views/messenger_settings/_messenger_select.html.slim
new file mode 100644
index 0000000..5a3099a
--- /dev/null
+++ b/app/views/messenger_settings/_messenger_select.html.slim
@@ -0,0 +1,7 @@
+p
+ = f.select mf, project_messenger_options(@messenger_setting.send(mf)), label: l("label_settings_#{mf}")
+ '
+ em.info[style="display: inline;"]
+ = l(:label_default)
+ ' :
+ = project_setting_messenger_default_value(mf)
diff --git a/app/views/messenger_settings/_messenger_text.html.erb b/app/views/messenger_settings/_messenger_text.html.erb
deleted file mode 100644
index 77f3d33..0000000
--- a/app/views/messenger_settings/_messenger_text.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-
- <%= f.text_field mf, size: size, label: l("label_settings_#{mf}") %>
- <%= l(:label_messenger_project_text_field_info) %> (<%= l(:label_default) %>: <%= Messenger.default_textfield(@project, mf) %>)
-
diff --git a/app/views/messenger_settings/_messenger_text.html.slim b/app/views/messenger_settings/_messenger_text.html.slim
new file mode 100644
index 0000000..69c4e1b
--- /dev/null
+++ b/app/views/messenger_settings/_messenger_text.html.slim
@@ -0,0 +1,9 @@
+p
+ = f.text_field mf, size: size, label: l("label_settings_#{mf}")
+ em.info
+ = l(:label_messenger_project_text_field_info)
+ | (
+ = l(:label_default)
+ ' :
+ = Messenger.default_textfield(@project, mf)
+ | )
diff --git a/app/views/messenger_settings/_show.html.erb b/app/views/messenger_settings/_show.html.erb
deleted file mode 100644
index e8ae920..0000000
--- a/app/views/messenger_settings/_show.html.erb
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
- <%
- @messenger_setting = MessengerSetting.find_or_create(@project.id)
-%>
-
-<%= labelled_form_for :setting, @messenger_setting,
- url: { controller: 'messenger_settings',
- action: 'save', id: @project, tab: 'messenger',
- partial: 'messenger_settings/save',
- setting_id: @messenger_setting.id } do |f| %>
- <%= error_messages_for 'messenger_setting' %>
-
-
-
<%= t(:messenger_settings_project_intro) %>
-
-
<%= f.text_field :messenger_url, size: 60, label: l(:label_settings_messenger_url) %><%= l(:label_messenger_project_text_field_info) %> (<%= l(:label_messenger_default_not_visible) %>)
-
- <%= render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :messenger_icon, size: 60 } %>
- <%= 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 } %>
-
-
-
<%= l(:label_issue_plural) %>
-
-
<%= t(:messenger_issue_intro) %>
-
- <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :auto_mentions } %>
- <%= render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :default_mentions, size: 30 } %>
- <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :display_watchers } %>
- <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_updates } %>
- <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :new_include_description } %>
- <%= 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 } %>
-
-
-
<%= l(:label_wiki) %>
-
-
<%= t(:messenger_wiki_intro) %>
-
- <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_wiki } %>
- <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_wiki_updates } %>
-
- <% if RedmineMessenger::REDMINE_DB_SUPPORT && User.current.allowed_to?(:view_db_entries, @project) %>
-
-
<%= l(:label_db_entry_plural) %>
-
<%= t(:messenger_db_intro) %>
- <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_db } %>
- <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_db_updates } %>
- <% end %>
-
- <% if RedmineMessenger::REDMINE_CONTACTS_SUPPORT && User.current.allowed_to?(:view_contacts, @project) %>
-
-
<%= l(:label_contact_plural) %>
-
<%= t(:messenger_contacts_intro) %>
- <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_contact } %>
- <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_contact_updates } %>
- <% end %>
-
- <% if Redmine::Plugin.installed?('redmine_passwords') && User.current.allowed_to?(:view_passwords, @project) %>
-
-
<%= l(:label_settings_post_password) %>
-
<%= t(:messenger_passwords_intro) %>
- <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_password } %>
- <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_password_updates } %>
- <% end %>
-
-
- <%= submit_tag l(:button_save) %>
-<% end %>
-
-
<%= t(:messenger_settings_intro) %>
-
-
- <%= content_tag(:label, l(:label_settings_messenger_url)) %>
- <%= text_field_tag('settings[messenger_url]', @settings[:messenger_url], size: 60, placeholder: 'https://rocket.chat/hooks/my_rocket_chat_token') %>
- <%= t(:messenger_url_info_html) %>
-
-
-
- <%= content_tag(:label, l(:label_settings_messenger_icon)) %>
- <%= text_field_tag('settings[messenger_icon]', @settings[:messenger_icon], size: 60) %>
-
-
-
- <%= content_tag(:label, l(:label_settings_messenger_channel)) %>
- <%= text_field_tag('settings[messenger_channel]', @settings[:messenger_channel], size: 30, placeholder: 'redmine') %>
- <%= t(:messenger_channel_info_html) %>
-
-
-
- <%= content_tag(:label, l(:label_settings_messenger_username)) %>
- <%= text_field_tag('settings[messenger_username]', @settings[:messenger_username], size: 30) %>
-
-
-
- <%= content_tag(:label, l(:label_settings_messenger_verify_ssl)) %>
- <%= check_box_tag 'settings[messenger_verify_ssl]', 1, @settings[:messenger_verify_ssl].to_i == 1 %>
- <%= t(:messenger_verify_ssl_info_html) %>
-
-
-
-<%= l(:label_issue_plural) %>
-
-<%= t(:messenger_issue_intro) %>
-
-
- <%= content_tag(:label, l(:label_settings_auto_mentions)) %>
- <%= check_box_tag 'settings[auto_mentions]', 1, @settings[:auto_mentions].to_i == 1 %>
-
-
-
- <%= content_tag(:label, l(:label_settings_default_mentions)) %>
- <%= text_field_tag('settings[default_mentions]', @settings[:default_mentions], size: 30) %>
- <%= t(:default_mentionsl_info) %>
-
-
-
- <%= content_tag(:label, l(:label_settings_display_watchers)) %>
- <%= check_box_tag 'settings[display_watchers]', 1, @settings[:display_watchers].to_i == 1 %>
-
-
- <%= content_tag(:label, l(:label_settings_post_updates)) %>
- <%= check_box_tag 'settings[post_updates]', 1, @settings[:post_updates].to_i == 1 %>
-
-
- <%= content_tag(:label, l(:label_settings_new_include_description)) %>
- <%= check_box_tag 'settings[new_include_description]', 1, @settings[:new_include_description].to_i == 1 %>
-
-
- <%= content_tag(:label, l(:label_settings_updated_include_description)) %>
- <%= check_box_tag 'settings[updated_include_description]', 1, @settings[:updated_include_description].to_i == 1 %>
-
-
- <%= content_tag(:label, l(:label_settings_post_private_issues)) %>
- <%= check_box_tag 'settings[post_private_issues]', 1, @settings[:post_private_issues].to_i == 1 %>
-
-
- <%= content_tag(:label, l(:label_settings_post_private_notes)) %>
- <%= check_box_tag 'settings[post_private_notes]', 1, @settings[:post_private_notes].to_i == 1 %>
-
-
-
-<%= l(:label_wiki) %>
-
-<%= t(:messenger_wiki_intro) %>
-
-
- <%= content_tag(:label, l(:label_settings_post_wiki)) %>
- <%= check_box_tag 'settings[post_wiki]', 1, @settings[:post_wiki].to_i == 1 %>
-
-
- <%= content_tag(:label, l(:label_settings_post_wiki_updates)) %>
- <%= check_box_tag 'settings[post_wiki_updates]', 1, @settings[:post_wiki_updates].to_i == 1 %>
-
-
-<% if RedmineMessenger::REDMINE_DB_SUPPORT %>
-
-<%= l(:label_db_entry_plural) %>
-
-<%= t(:messenger_db_intro) %>
-
-
- <%= content_tag(:label, l(:label_settings_post_db)) %>
- <%= check_box_tag 'settings[post_db]', 1, @settings[:post_db].to_i == 1 %>
-
-
- <%= content_tag(:label, l(:label_settings_post_db_updates)) %>
- <%= check_box_tag 'settings[post_db_updates]', 1, @settings[:post_db_updates].to_i == 1 %>
-
-<% end %>
-
-<% if RedmineMessenger::REDMINE_CONTACTS_SUPPORT %>
-
-<%= l(:label_contact_plural) %>
-
-<%= t(:messenger_contacts_intro) %>
-
-
- <%= content_tag(:label, l(:label_settings_post_contact)) %>
- <%= check_box_tag 'settings[post_contact]', 1, @settings[:post_contact].to_i == 1 %>
-
-
- <%= content_tag(:label, l(:label_settings_post_contact_updates)) %>
- <%= check_box_tag 'settings[post_contact_updates]', 1, @settings[:post_contact_updates].to_i == 1 %>
-
-<% end %>
-
-<% if Redmine::Plugin.installed?('redmine_passwords') %>
-
-<%= l(:label_password_plural) %>
-
-<%= t(:messenger_passwords_intro) %>
-
-
- <%= content_tag(:label, l(:label_settings_post_password)) %>
- <%= check_box_tag 'settings[post_password]', 1, @settings[:post_password].to_i == 1 %>
-
-
- <%= content_tag(:label, l(:label_settings_post_password_updates)) %>
- <%= check_box_tag 'settings[post_password_updates]', 1, @settings[:post_password_updates].to_i == 1 %>
-
-<% end %>
diff --git a/app/views/settings/_messenger_settings.html.slim b/app/views/settings/_messenger_settings.html.slim
new file mode 100644
index 0000000..db7d4c0
--- /dev/null
+++ b/app/views/settings/_messenger_settings.html.slim
@@ -0,0 +1,98 @@
+- @settings = ActionController::Parameters.new(@settings)
+.info = t(:messenger_settings_intro)
+br
+p
+ = content_tag(:label, l(:label_settings_messenger_url))
+ = text_field_tag('settings[messenger_url]', @settings[:messenger_url], size: 60, placeholder: 'https://rocket.chat/hooks/my_rocket_chat_token')
+ em.info = t(:messenger_url_info_html)
+p
+ = content_tag(:label, l(:label_settings_messenger_icon))
+ = text_field_tag('settings[messenger_icon]', @settings[:messenger_icon], size: 60)
+p
+ = content_tag(:label, l(:label_settings_messenger_channel))
+ = text_field_tag('settings[messenger_channel]', @settings[:messenger_channel], size: 30, placeholder: 'redmine')
+ em.info = t(:messenger_channel_info_html)
+p
+ = content_tag(:label, l(:label_settings_messenger_username))
+ = text_field_tag('settings[messenger_username]', @settings[:messenger_username], size: 30)
+p
+ = content_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)
+
+br
+h3 = l(:label_issue_plural)
+.info = t(:messenger_issue_intro)
+br
+p
+ = content_tag(:label, l(:label_settings_auto_mentions))
+ = check_box_tag 'settings[auto_mentions]', 1, @settings[:auto_mentions].to_i == 1
+p
+ = content_tag(:label, l(:label_settings_default_mentions))
+ = text_field_tag('settings[default_mentions]', @settings[:default_mentions], size: 30)
+ em.info = t(:default_mentionsl_info)
+p
+ = content_tag(:label, l(:label_settings_display_watchers))
+ = check_box_tag 'settings[display_watchers]', 1, @settings[:display_watchers].to_i == 1
+p
+ = content_tag(:label, l(:label_settings_post_updates))
+ = check_box_tag 'settings[post_updates]', 1, @settings[:post_updates].to_i == 1
+p
+ = content_tag(:label, l(:label_settings_new_include_description))
+ = check_box_tag 'settings[new_include_description]', 1, @settings[:new_include_description].to_i == 1
+p
+ = content_tag(:label, l(:label_settings_updated_include_description))
+ = check_box_tag 'settings[updated_include_description]', 1, @settings[:updated_include_description].to_i == 1
+p
+ = content_tag(:label, l(:label_settings_post_private_issues))
+ = check_box_tag 'settings[post_private_issues]', 1, @settings[:post_private_issues].to_i == 1
+p
+ = content_tag(:label, l(:label_settings_post_private_notes))
+ = check_box_tag 'settings[post_private_notes]', 1, @settings[:post_private_notes].to_i == 1
+
+br
+h3 = l(:label_wiki)
+.info = t(:messenger_wiki_intro)
+br
+p
+ = content_tag(:label, l(:label_settings_post_wiki))
+ = check_box_tag 'settings[post_wiki]', 1, @settings[:post_wiki].to_i == 1
+p
+ = content_tag(:label, l(:label_settings_post_wiki_updates))
+ = check_box_tag 'settings[post_wiki_updates]', 1, @settings[:post_wiki_updates].to_i == 1
+
+- if RedmineMessenger::REDMINE_DB_SUPPORT
+ br
+ h3 = l(:label_db_entry_plural)
+ .info = t(:messenger_db_intro)
+ br
+ p
+ = content_tag(:label, l(:label_settings_post_db))
+ = check_box_tag 'settings[post_db]', 1, @settings[:post_db].to_i == 1
+ p
+ = content_tag(:label, l(:label_settings_post_db_updates))
+ = check_box_tag 'settings[post_db_updates]', 1, @settings[:post_db_updates].to_i == 1
+
+- if RedmineMessenger::REDMINE_CONTACTS_SUPPORT
+ br
+ h3 = l(:label_contact_plural)
+ .info = t(:messenger_contacts_intro)
+ br
+ p
+ = content_tag(:label, l(:label_settings_post_contact))
+ = check_box_tag 'settings[post_contact]', 1, @settings[:post_contact].to_i == 1
+ p
+ = content_tag(:label, l(:label_settings_post_contact_updates))
+ = check_box_tag 'settings[post_contact_updates]', 1, @settings[:post_contact_updates].to_i == 1
+
+- if Redmine::Plugin.installed?('redmine_passwords')
+ br
+ h3 = l(:label_password_plural)
+ .info = t(:messenger_passwords_intro)
+ br
+ p
+ = content_tag(:label, l(:label_settings_post_password))
+ = check_box_tag 'settings[post_password]', 1, @settings[:post_password].to_i == 1
+ p
+ = content_tag(:label, l(:label_settings_post_password_updates))
+ = check_box_tag 'settings[post_password_updates]', 1, @settings[:post_password_updates].to_i == 1
diff --git a/init.rb b/init.rb
index 3b05375..a3ecc41 100644
--- a/init.rb
+++ b/init.rb
@@ -9,7 +9,7 @@ Redmine::Plugin.register :redmine_messenger do
url 'https://github.com/alphanodes/redmine_messenger'
author_url 'https://alphanodes.com/'
description 'Messenger integration for Slack, Rocketchat and Mattermost support'
- version '1.0.1'
+ version '1.0.2'
requires_redmine version_or_higher: '3.0.0'
diff --git a/lib/redmine_messenger.rb b/lib/redmine_messenger.rb
index 878ed5b..979ee0d 100644
--- a/lib/redmine_messenger.rb
+++ b/lib/redmine_messenger.rb
@@ -13,6 +13,7 @@ Rails.configuration.to_prepare do
def self.setting?(value)
return true if settings[value].to_i == 1
+ false
end
end
diff --git a/lib/redmine_messenger/patches/issue_patch.rb b/lib/redmine_messenger/patches/issue_patch.rb
index 4f700b7..e71442e 100644
--- a/lib/redmine_messenger/patches/issue_patch.rb
+++ b/lib/redmine_messenger/patches/issue_patch.rb
@@ -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,
diff --git a/lib/redmine_messenger/patches/wiki_page_patch.rb b/lib/redmine_messenger/patches/wiki_page_patch.rb
index be760d0..e8a4bca 100644
--- a/lib/redmine_messenger/patches/wiki_page_patch.rb
+++ b/lib/redmine_messenger/patches/wiki_page_patch.rb
@@ -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