##// END OF EJS Templates
Clean up custom field format definition....
Jean-Philippe Lang -
r9387:49b28fca6820
parent child
Show More
@@ -34,15 +34,15 Redmine::Scm::Base.add "Git"
34 Redmine::Scm::Base.add "Filesystem"
34 Redmine::Scm::Base.add "Filesystem"
35
35
36 Redmine::CustomFieldFormat.map do |fields|
36 Redmine::CustomFieldFormat.map do |fields|
37 fields.register Redmine::CustomFieldFormat.new('string', :label => :label_string, :order => 1)
37 fields.register 'string'
38 fields.register Redmine::CustomFieldFormat.new('text', :label => :label_text, :order => 2)
38 fields.register 'text'
39 fields.register Redmine::CustomFieldFormat.new('int', :label => :label_integer, :order => 3)
39 fields.register 'int', :label => :label_integer
40 fields.register Redmine::CustomFieldFormat.new('float', :label => :label_float, :order => 4)
40 fields.register 'float'
41 fields.register Redmine::CustomFieldFormat.new('list', :label => :label_list, :order => 5)
41 fields.register 'list'
42 fields.register Redmine::CustomFieldFormat.new('date', :label => :label_date, :order => 6)
42 fields.register 'date'
43 fields.register Redmine::CustomFieldFormat.new('bool', :label => :label_boolean, :order => 7)
43 fields.register 'bool', :label => :label_boolean
44 fields.register Redmine::CustomFieldFormat.new('user', :label => :label_user, :only => %w(Issue TimeEntry Version Project), :edit_as => 'list', :order => 8)
44 fields.register 'user', :only => %w(Issue TimeEntry Version Project), :edit_as => 'list'
45 fields.register Redmine::CustomFieldFormat.new('version', :label => :label_version, :only => %w(Issue TimeEntry Version Project), :edit_as => 'list', :order => 9)
45 fields.register 'version', :only => %w(Issue TimeEntry Version Project), :edit_as => 'list'
46 end
46 end
47
47
48 # Permissions
48 # Permissions
@@ -26,8 +26,8 module Redmine
26
26
27 def initialize(name, options={})
27 def initialize(name, options={})
28 self.name = name
28 self.name = name
29 self.label = options[:label]
29 self.label = options[:label] || "label_#{name}".to_sym
30 self.order = options[:order]
30 self.order = options[:order] || self.class.available_formats.size
31 self.edit_as = options[:edit_as] || name
31 self.edit_as = options[:edit_as] || name
32 self.class_names = options[:only]
32 self.class_names = options[:only]
33 end
33 end
@@ -62,7 +62,11 module Redmine
62 end
62 end
63
63
64 # Registers a custom field format
64 # Registers a custom field format
65 def register(custom_field_format, options={})
65 def register(*args)
66 custom_field_format = args.first
67 unless custom_field_format.is_a?(Redmine::CustomFieldFormat)
68 custom_field_format = Redmine::CustomFieldFormat.new(*args)
69 end
66 @@available[custom_field_format.name] = custom_field_format unless @@available.keys.include?(custom_field_format.name)
70 @@available[custom_field_format.name] = custom_field_format unless @@available.keys.include?(custom_field_format.name)
67 end
71 end
68
72
General Comments 0
You need to be logged in to leave comments. Login now