From 0427b97a46414f96f671040007de8652f4b7e7be Mon Sep 17 00:00:00 2001 From: Alexander Meindl Date: Tue, 10 Oct 2017 18:15:11 +0200 Subject: [PATCH] Support for existion database and some cosmetics --- CHANGELOG.md | 1 + app/models/messenger.rb | 5 ++--- app/views/messenger_settings/_show.html.erb | 2 +- app/views/settings/_messenger_settings.html.erb | 1 + config/locales/de.yml | 2 ++ config/locales/en.yml | 3 ++- config/locales/ja.yml | 2 ++ db/migrate/001_create_messenger_settings.rb | 1 - db/migrate/002_add_default_mentions.rb | 7 +++++++ init.rb | 2 +- 10 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 db/migrate/002_add_default_mentions.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index 478d7cd..34cc3ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Changelog ## 1.0.1 - not bumped and tagged yet * Japanese translation has been added - thanks @Yoto +* Default mentions has been added - thanks @xstasi ## 1.0.0 diff --git a/app/models/messenger.rb b/app/models/messenger.rb index 01c9e17..9853d8a 100644 --- a/app/models/messenger.rb +++ b/app/models/messenger.rb @@ -221,9 +221,8 @@ class Messenger def self.mentions(project, text) names = [] - Messenger.textfield_for_project(project, :default_mentions).split(',').each { |m| - names.push m.strip - } + Messenger.textfield_for_project(project, :default_mentions) + .split(',').each { |m| names.push m.strip } names += extract_usernames(text) unless text.nil? names.present? ? '\nTo: ' + names.join(', ') : nil end diff --git a/app/views/messenger_settings/_show.html.erb b/app/views/messenger_settings/_show.html.erb index de3e49b..e8ae920 100644 --- a/app/views/messenger_settings/_show.html.erb +++ b/app/views/messenger_settings/_show.html.erb @@ -27,8 +27,8 @@
<%= t(:messenger_issue_intro) %>

- <%= render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :default_mentions, size: 30 } %> <%= 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 } %> diff --git a/app/views/settings/_messenger_settings.html.erb b/app/views/settings/_messenger_settings.html.erb index 5c84d0a..ebbcfb5 100644 --- a/app/views/settings/_messenger_settings.html.erb +++ b/app/views/settings/_messenger_settings.html.erb @@ -43,6 +43,7 @@

<%= content_tag(:label, l(:label_settings_default_mentions)) %> <%= text_field_tag('settings[default_mentions]', @settings[:default_mentions], size: 30) %> + <%= t(:default_mentionsl_info) %>

diff --git a/config/locales/de.yml b/config/locales/de.yml index c52f5a0..586ab4d 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -18,6 +18,7 @@ de: label_messenger_wiki_updated: "[%{project_url}] Wiki %{url} aktualisiert von *%{user}*" label_messenger: Messenger label_settings_auto_mentions: Namen für Mentions konvertiert? + label_settings_default_mentions: Standardbenutzer für Mentions label_settings_display_watchers: Beobachter? label_settings_messenger_channel: Messenger Channel label_settings_messenger_icon: Messenger Icon @@ -48,3 +49,4 @@ de: messenger_verify_ssl_info_html: 'Falls der Messenger Service ein ungültiges oder selbst erstelltes (self-signed) SSL Zertifikat verwendet bitte deaktivieren.' messenger_wiki_intro: Legen Sie fest welche Einträge oder Änderungen für Wikis im angegebenen Messenger Channel versendet werden. label_messenger_setting: Messenger Einstellung + default_mentionsl_info: Benutzer, die immer mit Mentions benachrichtet werden sollen. Mehrere Namen können mit Komma getrennt angegeben werden (z.B. @all, @here). diff --git a/config/locales/en.yml b/config/locales/en.yml index 9d96817..8e287aa 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -18,7 +18,7 @@ en: label_messenger_wiki_updated: "[%{project_url}] Wiki %{url} updated by *%{user}*" label_messenger: Messenger label_settings_auto_mentions: Convert names to mentions? - label_settings_default_mentions: Default people to notify, comma separated (e.g. @all, @here) + label_settings_default_mentions: Default people for mentions label_settings_display_watchers: Display watchers? label_settings_messenger_channel: Messenger Channel label_settings_messenger_icon: Messenger Icon @@ -49,3 +49,4 @@ en: messenger_verify_ssl_info_html: 'If your Messenger service uses an invalid or self-signed SSL certificate, disable it.' messenger_wiki_intro: Activate the changes for Wikis that should be sent to the pre-defined Messenger channel. label_messenger_setting: Messenger Settings + default_mentionsl_info: Default people to notify, comma separated (e.g. @all, @here) diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 179694b..632e463 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -18,6 +18,7 @@ ja: label_messenger_wiki_updated: "[%{project_url}] Wiki %{url} が *%{user}* によって更新されました。" label_messenger: メッセンジャー label_settings_auto_mentions: ユーザー名をその人についての投稿(@ユーザー名)に変換する + label_settings_default_mentions: Default people for mentions label_settings_display_watchers: ウォッチャーを表示する label_settings_messenger_channel: メッセンジャーのチャンネル label_settings_messenger_icon: メッセンジャーのアイコン @@ -48,3 +49,4 @@ ja: messenger_verify_ssl_info_html: 'メッセンジャー サービスが自己署名証明書や不正な証明書を使っている場合、無効として下さい。' messenger_wiki_intro: メッセンジャーに送信するWikiのイベントにチェックを入れて下さい。 label_messenger_setting: メッセンジャーの設定 + default_mentionsl_info: Default people to notify, comma separated (e.g. @all, @here) diff --git a/db/migrate/001_create_messenger_settings.rb b/db/migrate/001_create_messenger_settings.rb index b4af710..ab0ef1f 100644 --- a/db/migrate/001_create_messenger_settings.rb +++ b/db/migrate/001_create_messenger_settings.rb @@ -8,7 +8,6 @@ class CreateMessengerSettings < ActiveRecord::Migration t.string :messenger_icon t.string :messenger_channel t.string :messenger_username - t.string :default_mentions t.integer :messenger_verify_ssl, default: 0, null: false t.integer :auto_mentions, default: 0, null: false t.integer :display_watchers, default: 0, null: false diff --git a/db/migrate/002_add_default_mentions.rb b/db/migrate/002_add_default_mentions.rb new file mode 100644 index 0000000..77e616f --- /dev/null +++ b/db/migrate/002_add_default_mentions.rb @@ -0,0 +1,7 @@ +# Redmine Messenger plugin for Redmine + +class AddDefaultMentions < ActiveRecord::Migration + def change + add_column :messenger_settings, :default_mentions, :string + end +end diff --git a/init.rb b/init.rb index 2ee2c65..3b05375 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.0' + version '1.0.1' requires_redmine version_or_higher: '3.0.0'