diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 07829c58d..5b18f14a6 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -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 diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 9fb08d651..4662950c1 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -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? diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb index 3bb46ad14..abad0f710 100644 --- a/app/controllers/workflows_controller.rb +++ b/app/controllers/workflows_controller.rb @@ -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] ||= {}} diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 80e3de855..e2ee6d535 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -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 diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index 21552dfd6..7c1027ad3 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -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 diff --git a/app/models/query.rb b/app/models/query.rb index b9a7181fa..1826bd509 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -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 diff --git a/app/views/trackers/_form.html.erb b/app/views/trackers/_form.html.erb index 2ccd225e6..7e3929d3f 100644 --- a/app/views/trackers/_form.html.erb +++ b/app/views/trackers/_form.html.erb @@ -17,7 +17,7 @@ <% Tracker::CORE_FIELDS.each do |field| %> <% end %>
diff --git a/app/views/trackers/fields.html.erb b/app/views/trackers/fields.html.erb index a9fe49351..c4de3ab45 100644 --- a/app/views/trackers/fields.html.erb +++ b/app/views/trackers/fields.html.erb @@ -26,7 +26,7 @@ <% Tracker::CORE_FIELDS.each do |field| %>