diff lib/redmine/custom_field_format.rb @ 1115:433d4f72a19b redmine-2.2

Update to Redmine SVN revision 11137 on 2.2-stable branch

--- a/lib/redmine/custom_field_format.rb	Wed Jun 27 14:54:18 2012 +0100
+++ b/lib/redmine/custom_field_format.rb	Mon Jan 07 12:01:42 2013 +0000
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2011  Jean-Philippe Lang
+# Copyright (C) 2006-2012  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -26,8 +26,8 @@
 
     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 @@
       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