jro_apps/redmine Commit - r2831:ac4937a76755

app/models/document_category_custom_field.rb created 644 +23 0

@@ -0,0 +1,23
	1	# redMine - project management software
	2	# Copyright (C) 2006 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	class DocumentCategoryCustomField < CustomField
	19	def type_name
	20	:enumeration_doc_categories
	21	end
	22	end
	23

app/models/issue_priority_custom_field.rb created 644 +23 0

@@ -0,0 +1,23
	1	# redMine - project management software
	2	# Copyright (C) 2006 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	class IssuePriorityCustomField < CustomField
	19	def type_name
	20	:enumeration_issue_priorities
	21	end
	22	end
	23

app/models/time_entry_activity_custom_field.rb created 644 +23 0

@@ -0,0 +1,23
	1	# redMine - project management software
	2	# Copyright (C) 2006 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	class TimeEntryActivityCustomField < CustomField
	19	def type_name
	20	:enumeration_time_entry_activities
	21	end
	22	end
	23

app/controllers/enumerations_controller.rb +3 0

             class EnumerationsController < ApplicationController
               before_filter :require_admin
+              helper :custom_fields
+              include CustomFieldsHelper
               def index
                 list

app/helpers/custom_fields_helper.rb +4 -1

                         {:name => 'TimeEntryCustomField', :partial => 'custom_fields/index', :label => :label_spent_time},
                         {:name => 'ProjectCustomField', :partial => 'custom_fields/index', :label => :label_project_plural},
                         {:name => 'UserCustomField', :partial => 'custom_fields/index', :label => :label_user_plural},
-                        {:name => 'GroupCustomField', :partial => 'custom_fields/index', :label => :label_group_plural}
+                        {:name => 'GroupCustomField', :partial => 'custom_fields/index', :label => :label_group_plural},
+                        {:name => 'TimeEntryActivityCustomField', :label => TimeEntryActivity::OptionName},
+                        {:name => 'IssuePriorityCustomField', :label => IssuePriority::OptionName},
+                        {:name => 'DocumentCategoryCustomField', :label => DocumentCategory::OptionName}
                         ]
               end

app/models/enumeration.rb +1 0

             class Enumeration < ActiveRecord::Base
               acts_as_list :scope => 'type = \'#{type}\''
+              acts_as_customizable
               before_destroy :check_integrity

app/views/custom_fields/_form.rhtml +3 0

             <% when "TimeEntryCustomField" %>
                 <p><%= f.check_box :is_required %></p>
+            <% else %>
+                <p><%= f.check_box :is_required %></p>
             <% end %>
             <%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %>
             </div>

app/views/enumerations/_form.rhtml +4 0

             <p><label for="enumeration_is_default"><%=l(:field_is_default)%></label>
             <%= check_box 'enumeration', 'is_default'  %></p>
             <!--[eoform:optvalue]-->
+            <% @enumeration.custom_field_values.each do |value| %>
+            	<p><%= custom_field_tag_with_label :enumeration, value %></p>
+            <% end %>
             </div>

test/fixtures/custom_fields.yml +14 -1

@@ -87,4 +87,17 custom_fields_006:
87	field_format: float	87	field_format: float
88	default_value: ""	88	default_value: ""
89	editable: true	89	editable: true
90	No newline at end of file	90	custom_fields_007:
		91	name: Billable
		92	min_length: 0
		93	regexp: ""
		94	is_for_all: false
		95	is_filter: true
		96	type: TimeEntryActivityCustomField
		97	max_length: 0
		98	possible_values: ""
		99	id: 7
		100	is_required: false
		101	field_format: bool
		102	default_value: ""
		103	editable: true

test/fixtures/custom_values.yml +6 -1

@@ -83,4 +83,9 custom_values_014:
83	customized_id: 5	83	customized_id: 5
84	id: 14	84	id: 14
85	value: "-7.6"	85	value: "-7.6"
86	No newline at end of file	86	custom_values_015:
		87	customized_type: TimeEntryActivity
		88	custom_field_id: 7
		89	customized_id: 10
		90	id: 15
		91	value: true

test/unit/enumeration_test.rb +6 -1

             require File.dirname(__FILE__) + '/../test_helper'
             class EnumerationTest < ActiveSupport::TestCase
-              fixtures :enumerations, :issues
+              fixtures :enumerations, :issues, :custom_fields, :custom_values
               def setup
               end
                 assert_nil Issue.find(:first, :conditions => {:priority_id => 4})
                 assert_equal 5, Enumeration.find(6).objects_count
               end
+              def test_should_be_customizable
+                assert Enumeration.included_modules.include?(Redmine::Acts::Customizable::InstanceMethods)
+              end
             end

test/unit/time_entry_activity_test.rb +49 0

@@ -32,5 +32,54 class TimeEntryActivityTest < ActiveSupport::TestCase
32	def test_option_name	32	def test_option_name
33	assert_equal :enumeration_activities, TimeEntryActivity.new.option_name	33	assert_equal :enumeration_activities, TimeEntryActivity.new.option_name
34	end	34	end
		35
		36	def test_create_with_custom_field
		37	field = TimeEntryActivityCustomField.find_by_name('Billable')
		38	e = TimeEntryActivity.new(:name => 'Custom Data')
		39	e.custom_field_values = {field.id => "1"}
		40	assert e.save
		41
		42	e.reload
		43	assert_equal "1", e.custom_value_for(field).value
		44	end
		45
		46	def test_create_without_required_custom_field_should_fail
		47	field = TimeEntryActivityCustomField.find_by_name('Billable')
		48	field.update_attribute(:is_required, true)
		49
		50	e = TimeEntryActivity.new(:name => 'Custom Data')
		51	assert !e.save
		52	assert_equal I18n.translate('activerecord.errors.messages.invalid'), e.errors.on(:custom_values)
		53	end
		54
		55	def test_create_with_required_custom_field_should_succeed
		56	field = TimeEntryActivityCustomField.find_by_name('Billable')
		57	field.update_attribute(:is_required, true)
		58
		59	e = TimeEntryActivity.new(:name => 'Custom Data')
		60	e.custom_field_values = {field.id => "1"}
		61	assert e.save
		62	end
		63
		64	def test_update_issue_with_required_custom_field_change
		65	field = TimeEntryActivityCustomField.find_by_name('Billable')
		66	field.update_attribute(:is_required, true)
		67
		68	e = TimeEntryActivity.find(10)
		69	assert e.available_custom_fields.include?(field)
		70	# No change to custom field, record can be saved
		71	assert e.save
		72	# Blanking custom field, save should fail
		73	e.custom_field_values = {field.id => ""}
		74	assert !e.save
		75	assert e.errors.on(:custom_values)
		76
		77	# Update custom field to valid value, save should succeed
		78	e.custom_field_values = {field.id => "0"}
		79	assert e.save
		80	e.reload
		81	assert_equal "0", e.custom_value_for(field).value
		82	end
		83
35	end	84	end
36		85

	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