From 49b28fca68209097d87021849347c52d97904dbb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 28 Apr 2012 16:19:32 +0000 Subject: Clean up custom field format definition. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9570 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/custom_field_format.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/redmine') diff --git a/lib/redmine/custom_field_format.rb b/lib/redmine/custom_field_format.rb index c0f4dcbc6..cd5c58f12 100644 --- a/lib/redmine/custom_field_format.rb +++ b/lib/redmine/custom_field_format.rb @@ -26,8 +26,8 @@ module Redmine def initialize(name, options={}) self.name = name - self.label = options[:label] - self.order = options[:order] + self.label = options[:label] || "label_#{name}".to_sym + self.order = options[:order] || self.class.available_formats.size self.edit_as = options[:edit_as] || name self.class_names = options[:only] end @@ -62,7 +62,11 @@ module Redmine end # Registers a custom field format - def register(custom_field_format, options={}) + def register(*args) + custom_field_format = args.first + unless custom_field_format.is_a?(Redmine::CustomFieldFormat) + custom_field_format = Redmine::CustomFieldFormat.new(*args) + end @@available[custom_field_format.name] = custom_field_format unless @@available.keys.include?(custom_field_format.name) end -- cgit v1.2.3