jro_apps/redmine Commit - r857:8610b191ae1a

0

test/unit/custom_field_test.rb created 644 +32 0

@@ -0,0 +1,32
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19
	20	class CustomFieldTest < Test::Unit::TestCase
	21	fixtures :custom_fields
	22
	23	def test_create
	24	field = UserCustomField.new(:name => 'Money money money', :field_format => 'float')
	25	assert field.save
	26	end
	27
	28	def test_destroy
	29	field = CustomField.find(1)
	30	assert field.destroy
	31	end
	32	end

0

test/unit/custom_value_test.rb created 644 +34 0

@@ -0,0 +1,34
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19
	20	class CustomValueTest < Test::Unit::TestCase
	21	fixtures :custom_fields
	22
	23	def test_float_field
	24	v = CustomValue.new(:customized => User.find(:first), :custom_field => UserCustomField.find_by_name('Money'))
	25	v.value = '11.2'
	26	assert v.save
	27	v.value = ''
	28	assert v.save
	29	v.value = '-6.250'
	30	assert v.save
	31	v.value = '6a'
	32	assert !v.save
	33	end
	34	end

0

app/helpers/custom_fields_helper.rb +2 -2

                 field_id = "custom_fields_#{custom_field.id}"
                 case custom_field.field_format
-                when "string", "int"
-                  text_field 'custom_value', 'value', :name => field_name, :id => field_id
                 when "date"
                   text_field('custom_value', 'value', :name => field_name, :id => field_id, :size => 10) +
                   calendar_for(field_id)
                   check_box 'custom_value', 'value', :name => field_name, :id => field_id
                 when "list"
                   select 'custom_value', 'value', custom_field.possible_values, { :include_blank => true }, :name => field_name, :id => field_id
+                else
+                  text_field 'custom_value', 'value', :name => field_name, :id => field_id
                 end
               end

0

app/models/custom_field.rb +4 -3

               FIELD_FORMATS = { "string" => { :name => :label_string, :order => 1 },
                                 "text" => { :name => :label_text, :order => 2 },
                                 "int" => { :name => :label_integer, :order => 3 },
-                                "list" => { :name => :label_list, :order => 4 },
+                                "float" => { :name => :label_float, :order => 4 },
-            			        "date" => { :name => :label_date, :order => 5 },
+                                "list" => { :name => :label_list, :order => 5 },
-            			        "bool" => { :name => :label_boolean, :order => 6 }
+            			        "date" => { :name => :label_date, :order => 6 },
+            			        "bool" => { :name => :label_boolean, :order => 7 }
               }.freeze
               validates_presence_of :name, :field_format

0

app/models/custom_value.rb +6 -5

                 errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length and value.length > 0
                 errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
                 case custom_field.field_format
-                when "int"
+                when 'int'
-                  errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[0-9]*$/
+                  errors.add(:value, :activerecord_error_not_a_number) unless value.blank? || value =~ /^[+-]?\d+$/
-                when "date"
+                when 'float'
+                  begin; !value.blank? && Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
+                when 'date'
                   errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.empty?
-                when "list"
+                when 'list'
                   errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include? value or value.empty?
                 end
               end
             end

0

app/views/custom_fields/_form.rhtml +1 -8

                   Element.hide(p_regexp.parentNode);
                   Element.show(p_values);
                   break;
-                case "int":
-                case "string":
-                case "text":
-                  Element.show(p_length.parentNode);
-                  Element.show(p_regexp.parentNode);
-                  Element.hide(p_values);
-                  break;
                 case "date":
                 case "bool":
                   Element.hide(p_length.parentNode);
                 default:
                   Element.show(p_length.parentNode);
                   Element.show(p_regexp.parentNode);
-                  Element.show(p_values);
+                  Element.hide(p_values);
                   break;
               }
             }

0

lang/bg.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

lang/cs.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

lang/de.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

lang/en.yml +1 0

             label_list: List
             label_date: Date
             label_integer: Integer
+            label_float: Float
             label_boolean: Boolean
             label_string: Text
             label_text: Long text

0

lang/es.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

lang/fr.yml +1 0

             label_list: Liste
             label_date: Date
             label_integer: Entier
+            label_float: Nombre décimal
             label_boolean: Booléen
             label_string: Texte
             label_text: Texte long

0

lang/he.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

lang/it.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

lang/ja.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

lang/nl.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

lang/pl.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

lang/pt-br.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

lang/pt.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

lang/ro.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

lang/sr.yml +1 0

             enumeration_issue_priorities: Prioriteti kartica
             enumeration_doc_categories: Kategorija dokumenata
             enumeration_activities: Aktivnosti (praćenje vremena))
+            label_float: Float

0

lang/sv.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

lang/zh.yml +1 0

             label_user_mail_option_all: "For any event on all my projects"
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             setting_emails_footer: Emails footer
+            label_float: Float

0

test/fixtures/custom_fields.yml +12 0

@@ -43,3 +43,15 custom_fields_004:
43	id: 4	43	id: 4
44	is_required: false	44	is_required: false
45	field_format: string	45	field_format: string
		46	custom_fields_005:
		47	name: Money
		48	min_length: 0
		49	regexp: ""
		50	is_for_all: false
		51	type: UserCustomField
		52	max_length: 0
		53	possible_values: ""
		54	id: 5
		55	is_required: false
		56	field_format: float
		57	No newline at end of file

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages