From 4837c0fbe3506513bae2a5a3fa713535dd0ce5c1 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Mon, 6 Oct 2025 22:45:02 +0000 Subject: [PATCH] Replaces the use of text_area with textarea (#43276). git-svn-id: https://svn.redmine.org/redmine/trunk@24030 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/settings_helper.rb | 4 ++-- app/views/auth_sources/_form_auth_source_ldap.html.erb | 2 +- app/views/custom_fields/_form.html.erb | 2 +- app/views/custom_fields/formats/_list.html.erb | 2 +- app/views/custom_fields/formats/_text.html.erb | 2 +- app/views/documents/_form.html.erb | 2 +- app/views/doorkeeper/applications/_form.html.erb | 2 +- app/views/issue_statuses/_form.html.erb | 2 +- app/views/issues/_edit.html.erb | 2 +- app/views/issues/_form.html.erb | 2 +- app/views/issues/bulk_edit.html.erb | 2 +- app/views/journals/_notes_form.html.erb | 2 +- app/views/mail_handler/new.html.erb | 2 +- app/views/messages/_form.html.erb | 2 +- app/views/news/_form.html.erb | 4 ++-- app/views/news/show.html.erb | 2 +- app/views/projects/_form.html.erb | 2 +- app/views/settings/_attachments.html.erb | 4 ++-- app/views/settings/_general.html.erb | 2 +- app/views/settings/_mail_handler.html.erb | 4 ++-- app/views/settings/_notifications.html.erb | 4 ++-- app/views/settings/_users.html.erb | 4 ++-- app/views/trackers/_form.html.erb | 2 +- app/views/users/_preferences.html.erb | 2 +- app/views/wiki/edit.html.erb | 2 +- lib/redmine/field_format.rb | 4 ++-- lib/redmine/views/labelled_form_builder.rb | 2 +- 27 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index c1f989805..0bec658a4 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -99,9 +99,9 @@ module SettingsHelper text_field_tag("settings[#{setting}]", setting_value(setting), options).html_safe end - def setting_text_area(setting, options={}) + def setting_textarea(setting, options={}) setting_label(setting, options).html_safe + - text_area_tag("settings[#{setting}]", setting_value(setting), options).html_safe + textarea_tag("settings[#{setting}]", setting_value(setting), options).html_safe end def setting_check_box(setting, options={}) diff --git a/app/views/auth_sources/_form_auth_source_ldap.html.erb b/app/views/auth_sources/_form_auth_source_ldap.html.erb index dc3f41095..fc2a7bf91 100644 --- a/app/views/auth_sources/_form_auth_source_ldap.html.erb +++ b/app/views/auth_sources/_form_auth_source_ldap.html.erb @@ -15,7 +15,7 @@ :onfocus => "this.value=''; this.name='auth_source[account_password]';", :onchange => "this.name='auth_source[account_password]';" %>

<%= f.text_field :base_dn, :required => true, :size => 60 %>

-

<%= f.text_area :filter, :size => 60, :label => :field_auth_source_ldap_filter %>

+

<%= f.textarea :filter, :size => 60, :label => :field_auth_source_ldap_filter %>

<%= f.text_field :timeout, :size => 4 %>

<%= f.check_box :onthefly_register, :label => :field_onthefly %>

diff --git a/app/views/custom_fields/_form.html.erb b/app/views/custom_fields/_form.html.erb index 9e544339f..fdc739b15 100644 --- a/app/views/custom_fields/_form.html.erb +++ b/app/views/custom_fields/_form.html.erb @@ -5,7 +5,7 @@

<%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :disabled => !@custom_field.new_record? %>

<%= f.text_field :name, :size => 50, :required => true %>

-

<%= f.text_area :description, :rows => 7 %>

+

<%= f.textarea :description, :rows => 7 %>

<% if @custom_field.format.multiple_supported %>

diff --git a/app/views/custom_fields/formats/_list.html.erb b/app/views/custom_fields/formats/_list.html.erb index f615e5057..5d7e6301d 100644 --- a/app/views/custom_fields/formats/_list.html.erb +++ b/app/views/custom_fields/formats/_list.html.erb @@ -1,5 +1,5 @@

- <%= f.text_area :possible_values, :value => @custom_field.possible_values.to_a.join("\n"), :rows => 15, :required => true %> + <%= f.textarea :possible_values, :value => @custom_field.possible_values.to_a.join("\n"), :rows => 15, :required => true %> <%= l(:text_custom_field_possible_values_info) %>

<%= f.text_field(:default_value) %>

diff --git a/app/views/custom_fields/formats/_text.html.erb b/app/views/custom_fields/formats/_text.html.erb index 79ea7c5e6..bd4a95753 100644 --- a/app/views/custom_fields/formats/_text.html.erb +++ b/app/views/custom_fields/formats/_text.html.erb @@ -3,4 +3,4 @@ <% if @custom_field.class.name == "IssueCustomField" %>

<%= f.check_box :full_width_layout %>

<% end %> -

<%= f.text_area(:default_value, :rows => 5) %>

+

<%= f.textarea(:default_value, :rows => 5) %>

diff --git a/app/views/documents/_form.html.erb b/app/views/documents/_form.html.erb index 82dcd9293..9215ddbb9 100644 --- a/app/views/documents/_form.html.erb +++ b/app/views/documents/_form.html.erb @@ -3,7 +3,7 @@

<%= f.select :category_id, DocumentCategory.active.collect {|c| [c.name, c.id]} %>

<%= f.text_field :title, :required => true, :size => 60 %>

-

<%= f.text_area :description, :cols => 60, :rows => 15, :class => 'wiki-edit', +

<%= f.textarea :description, :cols => 60, :rows => 15, :class => 'wiki-edit', :data => { :auto_complete => true }.merge(list_autofill_data_attributes) diff --git a/app/views/doorkeeper/applications/_form.html.erb b/app/views/doorkeeper/applications/_form.html.erb index e4f778f63..b501a7401 100644 --- a/app/views/doorkeeper/applications/_form.html.erb +++ b/app/views/doorkeeper/applications/_form.html.erb @@ -3,7 +3,7 @@

<%= f.text_field :name, :required => true %>

- <%= f.text_area :redirect_uri, :required => true, :size => 60, :label => :'activerecord.attributes.doorkeeper/application.redirect_uri' %> + <%= f.textarea :redirect_uri, :required => true, :size => 60, :label => :'activerecord.attributes.doorkeeper/application.redirect_uri' %> <%= t('doorkeeper.applications.help.redirect_uri') %> diff --git a/app/views/issue_statuses/_form.html.erb b/app/views/issue_statuses/_form.html.erb index c2487b002..ba58f038f 100644 --- a/app/views/issue_statuses/_form.html.erb +++ b/app/views/issue_statuses/_form.html.erb @@ -2,7 +2,7 @@

<%= f.text_field :name, :required => true %>

-

<%= f.text_area :description, :rows => 4 %>

+

<%= f.textarea :description, :rows => 4 %>

<% if Issue.use_status_for_done_ratio? %>

<%= f.select :default_done_ratio, ((0..100).step(Setting.issue_done_ratio_interval.to_i).to_a.collect {|r| ["#{r} %", r]}), :include_blank => true, :label => :field_done_ratio %>

<% end %> diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 299efec7a..a1839636d 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -29,7 +29,7 @@ <% end %> <% if @issue.notes_addable? %>
<%= l(:field_notes) %> - <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', + <%= f.textarea :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :data => { :auto_complete => true }.merge(list_autofill_data_attributes), diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb index 4e8e07856..4551adda7 100644 --- a/app/views/issues/_form.html.erb +++ b/app/views/issues/_form.html.erb @@ -33,7 +33,7 @@

<%= f.label_for_field :description, :required => @issue.required_attribute?('description') %> <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %> - <%= f.text_area :description, :cols => 60, :accesskey => accesskey(:edit), :class => 'wiki-edit', + <%= f.textarea :description, :cols => 60, :accesskey => accesskey(:edit), :class => 'wiki-edit', :rows => [[10, @issue.description.to_s.length / 50].max, 20].min, :data => { :auto_complete => true diff --git a/app/views/issues/bulk_edit.html.erb b/app/views/issues/bulk_edit.html.erb index 70582b735..6adc5a0ef 100644 --- a/app/views/issues/bulk_edit.html.erb +++ b/app/views/issues/bulk_edit.html.erb @@ -220,7 +220,7 @@

<%= l(:field_notes) %> -<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit', +<%= textarea_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :data => { :auto_complete => true }.merge(list_autofill_data_attributes) diff --git a/app/views/journals/_notes_form.html.erb b/app/views/journals/_notes_form.html.erb index 45f20a6c4..a4693be97 100644 --- a/app/views/journals/_notes_form.html.erb +++ b/app/views/journals/_notes_form.html.erb @@ -3,7 +3,7 @@ :method => 'put', :id => "journal-#{@journal.id}-form") do %> <%= label_tag "notes", l(:description_notes), :class => "hidden-for-sighted", :for => "journal_#{@journal.id}_notes" %> - <%= text_area_tag 'journal[notes]', @journal.notes, :id => "journal_#{@journal.id}_notes", :class => 'wiki-edit', + <%= textarea_tag 'journal[notes]', @journal.notes, :id => "journal_#{@journal.id}_notes", :class => 'wiki-edit', :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min), :data => { :auto_complete => true diff --git a/app/views/mail_handler/new.html.erb b/app/views/mail_handler/new.html.erb index d371cef40..653100dde 100644 --- a/app/views/mail_handler/new.html.erb +++ b/app/views/mail_handler/new.html.erb @@ -14,7 +14,7 @@
Raw Email - +
diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb index 492390036..ce13e4a72 100644 --- a/app/views/messages/_form.html.erb +++ b/app/views/messages/_form.html.erb @@ -23,7 +23,7 @@

<%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %> -<%= f.text_area :content, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'message_content', +<%= f.textarea :content, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'message_content', :accesskey => accesskey(:edit), :data => { :auto_complete => true diff --git a/app/views/news/_form.html.erb b/app/views/news/_form.html.erb index f86bba176..3598faf41 100644 --- a/app/views/news/_form.html.erb +++ b/app/views/news/_form.html.erb @@ -9,8 +9,8 @@

<% end %>

<%= f.text_field :title, :required => true, :size => 60 %>

-

<%= f.text_area :summary, :cols => 60, :rows => 2 %>

-

<%= f.text_area :description, :required => true, :cols => 60, :rows => 15, :class => 'wiki-edit', +

<%= f.textarea :summary, :cols => 60, :rows => 2 %>

+

<%= f.textarea :description, :required => true, :cols => 60, :rows => 15, :class => 'wiki-edit', :data => { :auto_complete => true }.merge(list_autofill_data_attributes) diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb index 11126998e..f71dec41e 100644 --- a/app/views/news/show.html.erb +++ b/app/views/news/show.html.erb @@ -67,7 +67,7 @@

<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>

<%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
- <%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit', + <%= textarea 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit', :data => { :auto_complete => true }.merge(list_autofill_data_attributes) diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb index 0f8733e28..deae8f357 100644 --- a/app/views/projects/_form.html.erb +++ b/app/views/projects/_form.html.erb @@ -4,7 +4,7 @@

<%= f.text_field :name, :required => true, :size => 60 %>

-

<%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :data => list_autofill_data_attributes %>

+

<%= f.textarea :description, :rows => 8, :class => 'wiki-edit', :data => list_autofill_data_attributes %>

<%= f.text_field :identifier, :required => true, :size => 60, :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH %> <% unless @project.identifier_frozen? %> <%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %> diff --git a/app/views/settings/_attachments.html.erb b/app/views/settings/_attachments.html.erb index f0430e4a9..06f716860 100644 --- a/app/views/settings/_attachments.html.erb +++ b/app/views/settings/_attachments.html.erb @@ -5,10 +5,10 @@

<%= setting_text_field :bulk_download_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>

-

<%= setting_text_area :attachment_extensions_allowed %> +

<%= setting_textarea :attachment_extensions_allowed %> <%= l(:text_comma_separated) %> <%= l(:label_example) %>: txt, png

-

<%= setting_text_area :attachment_extensions_denied %> +

<%= setting_textarea :attachment_extensions_denied %> <%= l(:text_comma_separated) %> <%= l(:label_example) %>: js, swf

<%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>

diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb index 5afd1cb44..934f63411 100644 --- a/app/views/settings/_general.html.erb +++ b/app/views/settings/_general.html.erb @@ -3,7 +3,7 @@

<%= setting_text_field :app_title, :size => 30 %>

-

<%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit', :data => list_autofill_data_attributes %>

+

<%= setting_textarea :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit', :data => list_autofill_data_attributes %>

<%= wikitoolbar_for 'settings_welcome_text' %> diff --git a/app/views/settings/_mail_handler.html.erb b/app/views/settings/_mail_handler.html.erb index 3b2bb8049..d4e541e53 100644 --- a/app/views/settings/_mail_handler.html.erb +++ b/app/views/settings/_mail_handler.html.erb @@ -2,7 +2,7 @@

- <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %> + <%= setting_textarea :mail_handler_body_delimiters, :rows => 5 %>

- <%= setting_text_area :mail_handler_excluded_filenames %> + <%= setting_textarea :mail_handler_excluded_filenames %>

<%= l(:setting_emails_header) %> -<%= setting_text_area :emails_header, :label => false, :class => 'wiki-edit', :rows => 5, :data => list_autofill_data_attributes %> +<%= setting_textarea :emails_header, :label => false, :class => 'wiki-edit', :rows => 5, :data => list_autofill_data_attributes %> <%= wikitoolbar_for 'settings_emails_header' %>
<%= l(:setting_emails_footer) %> -<%= setting_text_area :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5, :data => list_autofill_data_attributes %> +<%= setting_textarea :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5, :data => list_autofill_data_attributes %> <%= wikitoolbar_for 'settings_emails_footer' %>
diff --git a/app/views/settings/_users.html.erb b/app/views/settings/_users.html.erb index cc40dec58..0f1ed7708 100644 --- a/app/views/settings/_users.html.erb +++ b/app/views/settings/_users.html.erb @@ -3,10 +3,10 @@

<%= setting_text_field :max_additional_emails, :size => 6 %>

-

<%= setting_text_area :email_domains_allowed %> +

<%= setting_textarea :email_domains_allowed %> <%= l(:text_comma_separated) %> <%= l(:label_example) %>: example.com, example.org

-

<%= setting_text_area :email_domains_denied %> +

<%= setting_textarea :email_domains_denied %> <%= l(:text_comma_separated) %> <%= l(:label_example) %>: .example.com, foo.example.org, example.net

<%= setting_check_box :unsubscribe %>

diff --git a/app/views/trackers/_form.html.erb b/app/views/trackers/_form.html.erb index 9131ae538..33e9452e5 100644 --- a/app/views/trackers/_form.html.erb +++ b/app/views/trackers/_form.html.erb @@ -11,7 +11,7 @@ :required => true %>

<%= f.check_box :is_in_roadmap %>

-

<%= f.text_area :description, :rows => 4 %>

+

<%= f.textarea :description, :rows => 4 %>

<% Tracker::CORE_FIELDS.each do |field| %> diff --git a/app/views/users/_preferences.html.erb b/app/views/users/_preferences.html.erb index acc646913..e961ee0db 100644 --- a/app/views/users/_preferences.html.erb +++ b/app/views/users/_preferences.html.erb @@ -6,7 +6,7 @@

<%= pref_fields.select :textarea_font, textarea_font_options %>

<%= pref_fields.text_field :recently_used_projects, :size => 2 %>

<%= pref_fields.select :history_default_tab, history_default_tab_options %>

-

<%= pref_fields.text_area :toolbar_language_options, :rows => 4 %>

+

<%= pref_fields.textarea :toolbar_language_options, :rows => 4 %>

<%= pref_fields.select :default_issue_query, default_issue_query_options(@user), include_blank: l(:label_none) %>

<%= pref_fields.select :default_project_query, default_project_query_options(@user), include_blank: l(:label_none) %>

<% end %> diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb index 115b5b2c4..289444b69 100644 --- a/app/views/wiki/edit.html.erb +++ b/app/views/wiki/edit.html.erb @@ -13,7 +13,7 @@ <%= error_messages_for 'content' %>
-<%= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25, :accesskey => accesskey(:edit), +<%= textarea_tag 'content[text]', @text, :cols => 100, :rows => 25, :accesskey => accesskey(:edit), :class => 'wiki-edit', :data => { :auto_complete => true diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb index 39b21c874..f7d5695d5 100644 --- a/lib/redmine/field_format.rb +++ b/lib/redmine/field_format.rb @@ -438,11 +438,11 @@ module Redmine end def edit_tag(view, tag_id, tag_name, custom_value, options={}) - view.text_area_tag(tag_name, custom_value.value, options.merge(:id => tag_id, :rows => 8)) + view.textarea_tag(tag_name, custom_value.value, options.merge(:id => tag_id, :rows => 8)) end def bulk_edit_tag(view, tag_id, tag_name, custom_field, objects, value, options={}) - view.text_area_tag(tag_name, value, options.merge(:id => tag_id, :rows => 8)) + + view.textarea_tag(tag_name, value, options.merge(:id => tag_id, :rows => 8)) + '
'.html_safe + bulk_clear_tag(view, tag_id, tag_name, custom_field, value) end diff --git a/lib/redmine/views/labelled_form_builder.rb b/lib/redmine/views/labelled_form_builder.rb index b5b08200a..c08030d93 100644 --- a/lib/redmine/views/labelled_form_builder.rb +++ b/lib/redmine/views/labelled_form_builder.rb @@ -23,7 +23,7 @@ class Redmine::Views::LabelledFormBuilder < ActionView::Helpers::FormBuilder include Redmine::I18n (field_helpers.map(&:to_s) - %w(radio_button hidden_field fields_for check_box label) + - %w(date_select text_area)).each do |selector| + %w(date_selec)).each do |selector| src = <<-END_SRC def #{selector}(field, options = {}) label_for_field(field, options) + super(field, options.except(:label)).html_safe