##// END OF EJS Templates
Code cleanup (#22383)....
Jean-Philippe Lang -
r14949:dfb78be2a7d7
parent child
Show More
@@ -6,19 +6,14 module ActiveRecord
6 # Translate attribute names for validation errors display
6 # Translate attribute names for validation errors display
7 def self.human_attribute_name(attr, options = {})
7 def self.human_attribute_name(attr, options = {})
8 prepared_attr = attr.to_s.sub(/_id$/, '').sub(/^.+\./, '')
8 prepared_attr = attr.to_s.sub(/_id$/, '').sub(/^.+\./, '')
9 class_prefix = name.underscore.gsub('/', '_')
9
10
10 redmine_default =
11 redmine_default = [
11 [
12 :"field_#{class_prefix}_#{prepared_attr}",
12 :"field_#{name.underscore.gsub('/', '_')}_#{prepared_attr}",
13 :"field_#{prepared_attr}"
13 :"field_#{prepared_attr}"
14 ]
14 ]
15
15
16 options[:default] = redmine_default + Array(options[:default])
16 if options[:default].present?
17 options[:default] = [options[:default]] unless options[:default].is_a? Array
18 options[:default].unshift redmine_default
19 else
20 options[:default] = redmine_default
21 end
22
17
23 super
18 super
24 end
19 end
General Comments 0
You need to be logged in to leave comments. Login now