Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-15 09:46:02 +01:00
Code Issues Packages Projects Releases Activity

Replace String#sub with delete_prefix / delete_suffix (#40008).

Browse Source 
Patch by Go MAEDA (@maeda).


git-svn-id: https://svn.redmine.org/redmine/trunk@22596 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2024-01-08 01:04:37 +00:00
parent 4d3fc7f89e
commit 52a55f407b
14 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/repositories_controller.rb
View File

@@ -230,7 +230,7 @@ class RepositoriesController < ApplicationController
# Adds a related issue to a changeset
# POST /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues
def add_related_issue
issue_id = params[:issue_id].to_s.sub(/^#/, '')
issue_id = params[:issue_id].to_s.delete_prefix('#')
@issue = @changeset.find_referenced_issue_by_id(issue_id)
if @issue && (!@issue.visible? || @changeset.issues.include?(@issue))
@issue = nil

2
app/controllers/settings_controller.rb
View File

@@ -53,7 +53,7 @@ class SettingsController < ApplicationController
@deliveries = ActionMailer::Base.perform_deliveries
@guessed_host_and_path = request.host_with_port.dup
@guessed_host_and_path << ('/'+ Redmine::Utils.relative_url_root.gsub(%r{^\/}, '')) unless Redmine::Utils.relative_url_root.blank?
@guessed_host_and_path << ("/#{Redmine::Utils.relative_url_root.delete_prefix('/')}") unless Redmine::Utils.relative_url_root.blank?
@commit_update_keywords = Setting.commit_update_keywords.dup
@commit_update_keywords = [{}] unless @commit_update_keywords.is_a?(Array) && @commit_update_keywords.any?

4
app/controllers/workflows_controller.rb
View File

@@ -58,7 +58,9 @@ class WorkflowsController < ApplicationController
def permissions
if @roles && @trackers
@fields = (Tracker::CORE_FIELDS_ALL - @trackers.map(&:disabled_core_fields).reduce(:&)).map {|field| [field, l("field_"+field.sub(/_id$/, ''))]}
@fields = (Tracker::CORE_FIELDS_ALL - @trackers.map(&:disabled_core_fields).reduce(:&)).map do |field|
[field, l("field_#{field.delete_suffix('_id')}")]
end
@custom_fields = @trackers.map(&:custom_fields).flatten.uniq.sort
@permissions = WorkflowPermission.rules_by_status_id(@trackers, @roles)
@statuses.each {|status| @permissions[status.id] ||= {}}

4
app/helpers/issues_helper.rb
View File

@@ -528,8 +528,8 @@ module IssuesHelper
case detail.property
when 'attr'
field = detail.prop_key.to_s.gsub(/\_id$/, "")
label = l(("field_" + field).to_sym)
field = detail.prop_key.to_s.delete_suffix('_id')
label = l(("field_#{field}").to_sym)
case detail.prop_key
when 'due_date', 'start_date'
value = format_date(detail.value.to_date) if detail.value

4
app/models/issue_query.rb
View File

@@ -328,7 +328,7 @@ class IssueQuery < Query
:sortable => "#{Issue.table_name}.is_private", :groupable => true)
end
disabled_fields = Tracker.disabled_core_fields(trackers).map {|field| field.sub(/_id$/, '')}
disabled_fields = Tracker.disabled_core_fields(trackers).map {|field| field.delete_suffix('_id')}
disabled_fields << "total_estimated_hours" if disabled_fields.include?("estimated_hours")
@available_columns.reject! do |column|
disabled_fields.include?(column.name.to_s)
@@ -479,7 +479,7 @@ class IssueQuery < Query
def sql_for_notes_field(field, operator, value)
subquery = "SELECT 1 FROM #{Journal.table_name}" +
" WHERE #{Journal.table_name}.journalized_type='Issue' AND #{Journal.table_name}.journalized_id=#{Issue.table_name}.id" +
" AND (#{sql_for_field field, operator.sub(/^!/, ''), value, Journal.table_name, 'notes'})" +
" AND (#{sql_for_field field, operator.delete_prefix('!'), value, Journal.table_name, 'notes'})" +
" AND (#{Journal.visible_notes_condition(User.current, :skip_pre_condition => true)})"
"#{/^!/.match?(operator) ? "NOT EXISTS" : "EXISTS"} (#{subquery})"
end

2
app/models/query.rb
View File

@@ -211,7 +211,7 @@ class QueryFilter
def initialize(field, options)
@field = field.to_s
@options = options
@options[:name] ||= l(options[:label] || "field_#{field}".gsub(/_id$/, ''))
@options[:name] ||= l(options[:label] || "field_#{field}".delete_suffix('_id'))
# Consider filters with a Proc for values as remote by default
@remote = options.key?(:remote) ? options[:remote] : options[:values].is_a?(Proc)
end

2
app/views/trackers/_form.html.erb
View File

@@ -17,7 +17,7 @@
<% Tracker::CORE_FIELDS.each do |field| %>
<label class="block">
<%= check_box_tag 'tracker[core_fields][]', field, @tracker.core_fields.include?(field), :id => nil %>
<%= l("field_#{field}".sub(/_id$/, '')) %>
<%= l("field_#{field}".delete_suffix('_id')) %>
</label>
<% end %>
</p>

2
app/views/trackers/fields.html.erb
View File

@@ -26,7 +26,7 @@
</tr>
<% Tracker::CORE_FIELDS.each do |field| %>
<tr>
<% field_name = l("field_#{field}".sub(/_id$/, '')) %>
<% field_name = l("field_#{field}".delete_suffix('_id')) %>
<td class="name">
<%= link_to_function('', "toggleCheckboxesBySelector('input.core-field-#{field}')",
:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",

2
config/initializers/10-patches.rb
View File

@@ -4,7 +4,7 @@ module ActiveRecord
class Base
# Translate attribute names for validation errors display
def self.human_attribute_name(attr, options = {})
prepared_attr = attr.to_s.sub(/_id$/, '').sub(/^.+\./, '')
prepared_attr = attr.to_s.delete_suffix('_id').sub(/^.+\./, '')
class_prefix = name.underscore.tr('/', '_')
redmine_default = [

6
lib/redmine/diff_table.rb
View File

@@ -91,12 +91,12 @@ module Redmine
if both_git_diff
if file_name && arg == "/dev/null"
# keep the original file name
@file_name = file_name.sub(%r{^a/}, '')
@file_name = file_name.delete_prefix('a/')
else
# remove leading a/
@previous_file_name = file_name.sub(%r{^a/}, '') unless file_name == "/dev/null"
@previous_file_name = file_name.delete_prefix('a/') unless file_name == "/dev/null"
# remove leading b/
@file_name = arg.sub(%r{^b/}, '')
@file_name = arg.delete_prefix('b/')
@previous_file_name = nil if @previous_file_name == @file_name
end

2
lib/redmine/my_page.rb
View File

@@ -81,7 +81,7 @@ module Redmine
Dir.glob(
"#{Redmine::Plugin.directory}/*/app/views/my/blocks/_*.{rhtml,erb}"
).inject({}) do |h, file|
name = File.basename(file).split('.').first.gsub(/^_/, '')
name = File.basename(file).split('.').first.delete_prefix('_')
h[name] = {:label => name.to_sym, :partial => "my/blocks/#{name}"}
h
end

2
lib/redmine/themes.rb
View File

@@ -110,7 +110,7 @@ module Redmine
def assets(dir, ext=nil)
if ext
Dir.glob("#{path}/#{dir}/*.#{ext}").collect {|f| File.basename(f).gsub(/\.#{ext}$/, '')}
Dir.glob("#{path}/#{dir}/*.#{ext}").collect {|f| File.basename(f).delete_suffix(".#{ext}")}
else
Dir.glob("#{path}/#{dir}/*").collect {|f| File.basename(f)}
end

2
test/coverage/html_formatter.rb
View File

@@ -51,7 +51,7 @@ module Redmine
end
def shortened_filename(source_file)
source_file.filename.gsub(SimpleCov.root, '.').gsub(/^\.\//, '')
source_file.filename.gsub(SimpleCov.root, '.').delete_prefix('./')
end
def link_to_source_file(source_file)

2
test/functional/custom_fields_controller_test.rb
View File

@@ -596,7 +596,7 @@ class CustomFieldsControllerTest < Redmine::ControllerTest
def custom_field_classes
files =
Dir.glob(File.join(Rails.root, 'app/models/*_custom_field.rb')).
map {|f| File.basename(f).sub(/\.rb$/, '')}
map {|f| File.basename(f).delete_suffix('.rb')}
classes = files.map {|x| x.classify.constantize}
assert classes.size > 0
classes