frozen_string_literal, Coding standards fixed and ruby 2.7 warnings - redmine 4.1 and ruby 2.5 is required

This commit is contained in:
Alexander Meindl
2021-04-18 15:58:57 +02:00
parent 67a8faa284
commit dadaa32a57
37 changed files with 238 additions and 142 deletions

View File

@@ -1,7 +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)
em.info style="display: inline;"
= l :label_default
' :
= project_setting_messenger_default_value(mf)
= project_setting_messenger_default_value mf

View File

@@ -1,9 +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_messenger_project_text_field_info
| (
= l(:label_default)
= l :label_default
' :
= Messenger.default_textfield(@project, mf)
= Messenger.default_textfield @project, mf
| )

View File

@@ -1,6 +1,6 @@
= error_messages_for 'messenger_setting'
- @messenger_setting = MessengerSetting.find_or_create(@project.id)
- @messenger_setting = MessengerSetting.find_or_create @project.id
= labelled_form_for :setting,
@messenger_setting,
url: project_messenger_setting_path(project_id: @project),
@@ -8,20 +8,20 @@
class: 'tabular' do |f|
fieldset#messenger_settings.box.tabular
legend = l(:label_messenger_outgoing_webhook)
legend = l :label_messenger_outgoing_webhook
- if User.current.admin?
.contextual
= link_to l(:label_administration), plugin_settings_path(id: 'redmine_messenger'), class: 'icon icon-settings'
.info = t(:messenger_settings_project_intro)
.info = t :messenger_settings_project_intro
br
p
= f.text_field :messenger_url, size: 60, label: l(:label_settings_messenger_url)
em.info
= l(:label_messenger_project_text_field_info)
= l :label_messenger_project_text_field_info
| (
= l(:label_messenger_default_not_visible)
= 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 }
@@ -29,8 +29,8 @@
= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :messenger_verify_ssl }
fieldset#messenger_settings.box.tabular
legend = l(:label_issue_plural)
.info = t(:messenger_issue_intro)
legend = l :label_issue_plural
.info = t :messenger_issue_intro
br
= 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 }
@@ -43,16 +43,16 @@
= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :messenger_direct_users_messages }
fieldset#messenger_settings.box.tabular
legend = l(:label_wiki)
.info = t(:messenger_wiki_intro)
legend = l :label_wiki
.info = t :messenger_wiki_intro
br
= 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)
fieldset#messenger_settings.box.tabular
legend = l(:field_db_entries)
.info = t(:messenger_db_intro)
legend = l :field_db_entries
.info = t :messenger_db_intro
br
= 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 }
@@ -60,8 +60,8 @@
- if RedmineMessenger::REDMINE_CONTACTS_SUPPORT && User.current.allowed_to?(:view_contacts, @project)
fieldset#messenger_settings.box.tabular
legend = l(:label_contact_plural)
.info = t(:messenger_contacts_intro)
legend = l :label_contact_plural
.info = t :messenger_contacts_intro
br
= 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 }
@@ -69,8 +69,8 @@
- if Redmine::Plugin.installed?('redmine_passwords') && User.current.allowed_to?(:view_passwords, @project)
fieldset#messenger_settings.box.tabular
legend = l(:field_passwords)
.info = t(:messenger_passwords_intro)
legend = l :field_passwords
.info = t :messenger_passwords_intro
br
= 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 }

View File

@@ -1,111 +1,111 @@
.info = t(:messenger_settings_intro)
.info = t :messenger_settings_intro
br
fieldset#messenger_settings.box.tabular
legend = l(:label_messenger_outgoing_webhook)
legend = l :label_messenger_outgoing_webhook
p
= tag.label l(:label_settings_messenger_url)
= text_field_tag('settings[messenger_url]', @settings[:messenger_url], size: 60, placeholder: 'https://webhook.url')
em.info = t(:messenger_url_info_html)
label = l :label_settings_messenger_url
= text_field_tag 'settings[messenger_url]', @settings[:messenger_url], size: 60, placeholder: 'https://webhook.url'
em.info = t :messenger_url_info_html
p
= tag.label l(:label_settings_messenger_icon)
= text_field_tag('settings[messenger_icon]', @settings[:messenger_icon], size: 60)
label = l :label_settings_messenger_icon
= text_field_tag 'settings[messenger_icon]', @settings[:messenger_icon], size: 60
p
= 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)
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
= tag.label l(:label_settings_messenger_username)
= text_field_tag('settings[messenger_username]', @settings[:messenger_username], size: 30)
label = l :label_settings_messenger_username
= text_field_tag 'settings[messenger_username]', @settings[:messenger_username], size: 30
p
= tag.label l(:label_settings_messenger_verify_ssl)
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)
em.info = t :messenger_verify_ssl_info_html
fieldset#messenger_settings.box.tabular
legend = l(:label_issue_plural)
.info = t(:messenger_issue_intro)
legend = l :label_issue_plural
.info = t :messenger_issue_intro
br
p
= tag.label l(:label_settings_auto_mentions)
label = l :label_settings_auto_mentions
= check_box_tag 'settings[auto_mentions]', 1, @settings[:auto_mentions].to_i == 1
p
= tag.label l(:label_settings_default_mentions)
= text_field_tag('settings[default_mentions]', @settings[:default_mentions], size: 30)
em.info = t(:default_mentionsl_info)
label = l :label_settings_default_mentions
= text_field_tag 'settings[default_mentions]', @settings[:default_mentions], size: 30
em.info = t :default_mentionsl_info
p
= tag.label l(:label_settings_display_watchers)
label = l :label_settings_display_watchers
= check_box_tag 'settings[display_watchers]', 1, @settings[:display_watchers].to_i == 1
p
= tag.label l(:label_settings_post_updates)
label = l :label_settings_post_updates
= check_box_tag 'settings[post_updates]', 1, @settings[:post_updates].to_i == 1
p
= tag.label l(:label_settings_new_include_description)
label = l :label_settings_new_include_description
= check_box_tag 'settings[new_include_description]', 1, @settings[:new_include_description].to_i == 1
p
= tag.label l(:label_settings_updated_include_description)
label = l :label_settings_updated_include_description
= check_box_tag 'settings[updated_include_description]', 1, @settings[:updated_include_description].to_i == 1
p
= tag.label l(:label_settings_post_private_issues)
label = l :label_settings_post_private_issues
= check_box_tag 'settings[post_private_issues]', 1, @settings[:post_private_issues].to_i == 1
p
= tag.label l(:label_settings_post_private_notes)
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)
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)
em.info = t :messenger_direct_users_messages_info_html
fieldset#messenger_settings.box.tabular
legend = l(:label_wiki)
.info = t(:messenger_wiki_intro)
legend = l :label_wiki
.info = t :messenger_wiki_intro
br
p
= tag.label l(:label_settings_post_wiki)
label = l :label_settings_post_wiki
= check_box_tag 'settings[post_wiki]', 1, @settings[:post_wiki].to_i == 1
p
= tag.label l(:label_settings_post_wiki_updates)
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
fieldset#messenger_settings.box.tabular
legend = l(:field_db_entries)
.info = t(:messenger_db_intro)
legend = l :field_db_entries
.info = t :messenger_db_intro
br
p
= tag.label l(:label_settings_post_db)
label = l :label_settings_post_db
= check_box_tag 'settings[post_db]', 1, @settings[:post_db].to_i == 1
p
= tag.label l(:label_settings_post_db_updates)
label = l :label_settings_post_db_updates
= check_box_tag 'settings[post_db_updates]', 1, @settings[:post_db_updates].to_i == 1
p
= tag.label l(:label_settings_post_private_db)
label = l :label_settings_post_private_db
= check_box_tag 'settings[post_private_db]', 1, @settings[:post_private_db].to_i == 1
- if RedmineMessenger::REDMINE_CONTACTS_SUPPORT
fieldset#messenger_settings.box.tabular
legend = l(:label_contact_plural)
.info = t(:messenger_contacts_intro)
legend = l :label_contact_plural
.info = t :messenger_contacts_intro
br
p
= tag.label l(:label_settings_post_contact)
label = l :label_settings_post_contact
= check_box_tag 'settings[post_contact]', 1, @settings[:post_contact].to_i == 1
p
= tag.label l(:label_settings_post_contact_updates)
label = l :label_settings_post_contact_updates
= check_box_tag 'settings[post_contact_updates]', 1, @settings[:post_contact_updates].to_i == 1
p
= tag.label l(:label_settings_post_private_contacts)
label = l :label_settings_post_private_contacts
= check_box_tag 'settings[post_private_contacts]', 1, @settings[:post_private_contacts].to_i == 1
- if Redmine::Plugin.installed?('redmine_passwords')
- if Redmine::Plugin.installed? 'redmine_passwords'
fieldset#messenger_settings.box.tabular
legend = l(:field_passwords)
.info = t(:messenger_passwords_intro)
legend = l :field_passwords
.info = t :messenger_passwords_intro
br
p
= tag.label l(:label_settings_post_password)
label = l :label_settings_post_password
= check_box_tag 'settings[post_password]', 1, @settings[:post_password].to_i == 1
p
= tag.label l(:label_settings_post_password_updates)
label = l :label_settings_post_password_updates
= check_box_tag 'settings[post_password_updates]', 1, @settings[:post_password_updates].to_i == 1