jro_apps/redmine Commit - r2831:ac4937a76755

Enumerations can now have custom fields defined on them. #4077...

Eric Davis -

r2831:ac4937a76755

parent child

Context file:

r2831:ac4937a76755

Collapse all files

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

             # redMine - project management software
             # Copyright (C) 2006  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
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class EnumerationsController < ApplicationController
               before_filter :require_admin
+              helper :custom_fields
+              include CustomFieldsHelper
               def index
                 list
                 render :action => 'list'
               end
               # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
               verify :method => :post, :only => [ :destroy, :create, :update ],
                      :redirect_to => { :action => :list }
               def list
               end
               def new
                 begin
                   @enumeration = params[:type].constantize.new
                 rescue NameError
                   @enumeration = Enumeration.new
                 end
               end
               def create
                 @enumeration = Enumeration.new(params[:enumeration])
                 @enumeration.type = params[:enumeration][:type]
                 if @enumeration.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list', :type => @enumeration.type
                 else
                   render :action => 'new'
                 end
               end
               def edit
                 @enumeration = Enumeration.find(params[:id])
               end
               def update
                 @enumeration = Enumeration.find(params[:id])
                 @enumeration.type = params[:enumeration][:type] if params[:enumeration][:type]
                 if @enumeration.update_attributes(params[:enumeration])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list', :type => @enumeration.type
                 else
                   render :action => 'edit'
                 end
               end
               def destroy
                 @enumeration = Enumeration.find(params[:id])
                 if !@enumeration.in_use?
                   # No associated objects
                   @enumeration.destroy
                   redirect_to :action => 'index'
                 elsif params[:reassign_to_id]
                   if reassign_to = Enumeration.find_by_type_and_id(@enumeration.type, params[:reassign_to_id])
                     @enumeration.destroy(reassign_to)
                     redirect_to :action => 'index'
                   end
                 end
                 @enumerations = Enumeration.find(:all, :conditions => ['type = (?)', @enumeration.type]) - [@enumeration]
               #rescue
               #  flash[:error] = 'Unable to delete enumeration'
               #  redirect_to :action => 'index'
               end
             end

app/helpers/custom_fields_helper.rb +4 -1

             # redMine - project management software
             # Copyright (C) 2006  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
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module CustomFieldsHelper
               def custom_fields_tabs
                 tabs = [{:name => 'IssueCustomField', :partial => 'custom_fields/index', :label => :label_issue_plural},
                         {: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
               # Return custom field html tag corresponding to its format
               def custom_field_tag(name, custom_value)
                 custom_field = custom_value.custom_field
                 field_name = "#{name}[custom_field_values][#{custom_field.id}]"
                 field_id = "#{name}_custom_field_values_#{custom_field.id}"
                 case custom_field.field_format
                 when "date"
                   text_field_tag(field_name, custom_value.value, :id => field_id, :size => 10) +
                   calendar_for(field_id)
                 when "text"
                   text_area_tag(field_name, custom_value.value, :id => field_id, :rows => 3, :style => 'width:90%')
                 when "bool"
                   hidden_field_tag(field_name, '0') + check_box_tag(field_name, '1', custom_value.true?, :id => field_id)
                 when "list"
                   blank_option = custom_field.is_required? ?
                                    (custom_field.default_value.blank? ? "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" : '') :
                                    '<option></option>'
                   select_tag(field_name, blank_option + options_for_select(custom_field.possible_values, custom_value.value), :id => field_id)
                 else
                   text_field_tag(field_name, custom_value.value, :id => field_id)
                 end
               end
               # Return custom field label tag
               def custom_field_label_tag(name, custom_value)
                 content_tag "label", custom_value.custom_field.name +
             	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
             	:for => "#{name}_custom_field_values_#{custom_value.custom_field.id}",
             	:class => (custom_value.errors.empty? ? nil : "error" )
               end
               # Return custom field tag with its label tag
               def custom_field_tag_with_label(name, custom_value)
                 custom_field_label_tag(name, custom_value) + custom_field_tag(name, custom_value)
               end
               # Return a string used to display a custom value
               def show_value(custom_value)
                 return "" unless custom_value
                 format_value(custom_value.value, custom_value.custom_field.field_format)
               end
               # Return a string used to display a custom value
               def format_value(value, field_format)
                 return "" unless value && !value.empty?
                 case field_format
                 when "date"
                   begin; format_date(value.to_date); rescue; value end
                 when "bool"
                   l(value == "1" ? :general_text_Yes : :general_text_No)
                 else
                   value
                 end
               end
               # Return an array of custom field formats which can be used in select_tag
               def custom_field_formats_for_select
                 CustomField::FIELD_FORMATS.sort {|a,b| a[1][:order]<=>b[1][:order]}.collect { |k| [ l(k[1][:name]), k[0] ] }
               end
             end

app/models/enumeration.rb +1 0

             # redMine - project management software
             # Copyright (C) 2006  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
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Enumeration < ActiveRecord::Base
               acts_as_list :scope => 'type = \'#{type}\''
+              acts_as_customizable
               before_destroy :check_integrity
               validates_presence_of :name
               validates_uniqueness_of :name, :scope => [:type]
               validates_length_of :name, :maximum => 30
               # Backwards compatiblity named_scopes.
               # Can be removed post-0.9
               named_scope :priorities, :conditions => { :type => "IssuePriority" }, :order => 'position' do
                 ActiveSupport::Deprecation.warn("Enumeration#priorities is deprecated, use the IssuePriority class. (#{Redmine::Info.issue(3007)})")
                 def default
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               named_scope :document_categories, :conditions => { :type => "DocumentCategory" }, :order => 'position' do
                 ActiveSupport::Deprecation.warn("Enumeration#document_categories is deprecated, use the DocumentCategories class. (#{Redmine::Info.issue(3007)})")
                 def default
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               named_scope :activities, :conditions => { :type => "TimeEntryActivity" }, :order => 'position' do
                 ActiveSupport::Deprecation.warn("Enumeration#activities is deprecated, use the TimeEntryActivity class. (#{Redmine::Info.issue(3007)})")
                 def default
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               named_scope :values, lambda {|type| { :conditions => { :type => type }, :order => 'position' } } do
                 def default
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               named_scope :all, :order => 'position'
               def self.default
                 # Creates a fake default scope so Enumeration.default will check
                 # it's type.  STI subclasses will automatically add their own
                 # types to the finder.
                 if self.descends_from_active_record?
                   find(:first, :conditions => { :is_default => true, :type => 'Enumeration' })
                 else
                   # STI classes are
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               # Overloaded on concrete classes
               def option_name
                 nil
               end
               # Backwards compatiblity.  Can be removed post-0.9
               def opt
                 ActiveSupport::Deprecation.warn("Enumeration#opt is deprecated, use the STI classes now. (#{Redmine::Info.issue(3007)})")
                 return OptName
               end
               def before_save
                 if is_default? && is_default_changed?
                   Enumeration.update_all("is_default = #{connection.quoted_false}", {:type => type})
                 end
               end
               # Overloaded on concrete classes
               def objects_count
               end
               def in_use?
                 self.objects_count != 0
               end
               alias :destroy_without_reassign :destroy
               # Destroy the enumeration
               # If a enumeration is specified, objects are reassigned
               def destroy(reassign_to = nil)
                 if reassign_to && reassign_to.is_a?(Enumeration)
                   self.transfer_relations(reassign_to)
                 end
                 destroy_without_reassign
               end
               def <=>(enumeration)
                 position <=> enumeration.position
               end
               def to_s; name end
               # Returns the Subclasses of Enumeration.  Each Subclass needs to be
               # required in development mode.
               #
               # Note: subclasses is protected in ActiveRecord
               def self.get_subclasses
                 @@subclasses[Enumeration]
               end
             private
               def check_integrity
                 raise "Can't delete enumeration" if self.in_use?
               end
             end
             # Force load the subclasses in development mode
             require_dependency 'time_entry_activity'
             require_dependency 'document_category'
             require_dependency 'issue_priority'

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

             <%= error_messages_for 'custom_field' %>
             <script type="text/javascript">
             //<![CDATA[
             function toggle_custom_field_format() {
               format = $("custom_field_field_format");
               p_length = $("custom_field_min_length");
               p_regexp = $("custom_field_regexp");
               p_values = $("custom_field_possible_values");
               p_searchable = $("custom_field_searchable");
               p_default = $("custom_field_default_value");
               p_default.setAttribute('type','text');
               Element.show(p_default.parentNode);
               switch (format.value) {
                 case "list":
                   Element.hide(p_length.parentNode);
                   Element.hide(p_regexp.parentNode);
                   if (p_searchable) Element.show(p_searchable.parentNode);
                   Element.show(p_values);
                   break;
                 case "bool":
                   p_default.setAttribute('type','checkbox');
                   Element.hide(p_length.parentNode);
                   Element.hide(p_regexp.parentNode);
                   if (p_searchable) Element.hide(p_searchable.parentNode);
                   Element.hide(p_values);
                   break;
                 case "date":
                   Element.hide(p_length.parentNode);
                   Element.hide(p_regexp.parentNode);
                   if (p_searchable) Element.hide(p_searchable.parentNode);
                   Element.hide(p_values);
                   break;
                 case "float":
                 case "int":
                   Element.show(p_length.parentNode);
                   Element.show(p_regexp.parentNode);
                   if (p_searchable) Element.hide(p_searchable.parentNode);
                   Element.hide(p_values);
                   break;
                 default:
                   Element.show(p_length.parentNode);
                   Element.show(p_regexp.parentNode);
                   if (p_searchable) Element.show(p_searchable.parentNode);
                   Element.hide(p_values);
                   break;
               }
             }
             //]]>
             </script>
             <div class="box">
             <p><%= f.text_field :name, :required => true %></p>
             <p><%= f.select :field_format, custom_field_formats_for_select, {}, :onchange => "toggle_custom_field_format();",
             																																		:disabled => !@custom_field.new_record? %></p>
             <p><label for="custom_field_min_length"><%=l(:label_min_max_length)%></label>
                <%= f.text_field :min_length, :size => 5, :no_label => true %> -
                <%= f.text_field :max_length, :size => 5, :no_label => true %><br>(<%=l(:text_min_max_length_info)%>)</p>
             <p><%= f.text_field :regexp, :size => 50 %><br>(<%=l(:text_regexp_info)%>)</p>
             <p id="custom_field_possible_values"><%= f.text_area :possible_values, :value => @custom_field.possible_values.to_a.join("\n"),
             																																			 :cols => 20,
             																																			 :rows => 15 %>
             <br /><em><%= l(:text_custom_field_possible_values_info) %></em></p>
             <p><%= @custom_field.field_format == 'bool' ? f.check_box(:default_value) : f.text_field(:default_value) %></p>
             <%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
             </div>
             <div class="box">
             <% case @custom_field.class.name
             when "IssueCustomField" %>
                 <fieldset><legend><%=l(:label_tracker_plural)%></legend>
                 <% for tracker in @trackers %>
                     <%= check_box_tag "custom_field[tracker_ids][]", tracker.id, (@custom_field.trackers.include? tracker) %> <%= tracker.name %>
                 <% end %>
             		<%= hidden_field_tag "custom_field[tracker_ids][]", '' %>
                 </fieldset>
                 &nbsp;
                 <p><%= f.check_box :is_required %></p>
                 <p><%= f.check_box :is_for_all %></p>
                 <p><%= f.check_box :is_filter %></p>
                 <p><%= f.check_box :searchable %></p>
             <% when "UserCustomField" %>
                 <p><%= f.check_box :is_required %></p>
                 <p><%= f.check_box :editable %></p>
             <% when "ProjectCustomField" %>
                 <p><%= f.check_box :is_required %></p>
             <% 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>
             <%= javascript_tag "toggle_custom_field_format();" %>

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

             <%= error_messages_for 'enumeration' %>
             <div class="box">
             <!--[form:optvalue]-->
             <%= hidden_field 'enumeration', 'type'  %>
             <p><label for="enumeration_name"><%=l(:field_name)%></label>
             <%= text_field 'enumeration', 'name'  %></p>
             <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

             ---
             custom_fields_001:
               name: Database
               min_length: 0
               regexp: ""
               is_for_all: true
               is_filter: true
               type: IssueCustomField
               max_length: 0
               possible_values:
               - MySQL
               - PostgreSQL
               - Oracle
               id: 1
               is_required: false
               field_format: list
               default_value: ""
               editable: true
             custom_fields_002:
               name: Searchable field
               min_length: 1
               regexp: ""
               is_for_all: true
               type: IssueCustomField
               max_length: 100
               possible_values: ""
               id: 2
               is_required: false
               field_format: string
               searchable: true
               default_value: "Default string"
               editable: true
             custom_fields_003:
               name: Development status
               min_length: 0
               regexp: ""
               is_for_all: false
               is_filter: true
               type: ProjectCustomField
               max_length: 0
               possible_values:
               - Stable
               - Beta
               - Alpha
               - Planning
               id: 3
               is_required: true
               field_format: list
               default_value: ""
               editable: true
             custom_fields_004:
               name: Phone number
               min_length: 0
               regexp: ""
               is_for_all: false
               type: UserCustomField
               max_length: 0
               possible_values: ""
               id: 4
               is_required: false
               field_format: string
               default_value: ""
               editable: true
             custom_fields_005:
               name: Money
               min_length: 0
               regexp: ""
               is_for_all: false
               type: UserCustomField
               max_length: 0
               possible_values: ""
               id: 5
               is_required: false
               field_format: float
               default_value: ""
               editable: true
             custom_fields_006:
               name: Float field
               min_length: 0
               regexp: ""
               is_for_all: true
               type: IssueCustomField
               max_length: 0
               possible_values: ""
               id: 6
               is_required: false
               field_format: float
               default_value: ""
               editable: true
-  No newline at end of file
+            custom_fields_007:
+              name: Billable
+              min_length: 0
+              regexp: ""
+              is_for_all: false
+              is_filter: true
+              type: TimeEntryActivityCustomField
+              max_length: 0
+              possible_values: ""
+              id: 7
+              is_required: false
+              field_format: bool
+              default_value: ""
+              editable: true

test/fixtures/custom_values.yml +6 -1

             ---
             custom_values_006:
               customized_type: Issue
               custom_field_id: 2
               customized_id: 3
               id: 6
               value: "125"
             custom_values_007:
               customized_type: Project
               custom_field_id: 3
               customized_id: 1
               id: 7
               value: Stable
             custom_values_001:
               customized_type: Principal
               custom_field_id: 4
               customized_id: 3
               id: 1
               value: ""
             custom_values_002:
               customized_type: Principal
               custom_field_id: 4
               customized_id: 4
               id: 2
               value: 01 23 45 67 89
             custom_values_003:
               customized_type: Principal
               custom_field_id: 4
               customized_id: 2
               id: 3
               value: ""
             custom_values_004:
               customized_type: Issue
               custom_field_id: 2
               customized_id: 1
               id: 4
               value: "125"
             custom_values_005:
               customized_type: Issue
               custom_field_id: 2
               customized_id: 2
               id: 5
               value: ""
             custom_values_008:
               customized_type: Issue
               custom_field_id: 1
               customized_id: 3
               id: 8
               value: "MySQL"
             custom_values_009:
               customized_type: Issue
               custom_field_id: 2
               customized_id: 3
               id: 9
               value: "this is a stringforcustomfield search"
             custom_values_010:
               customized_type: Issue
               custom_field_id: 6
               customized_id: 1
               id: 10
               value: "2.1"
             custom_values_011:
               customized_type: Issue
               custom_field_id: 6
               customized_id: 2
               id: 11
               value: "2.05"
             custom_values_012:
               customized_type: Issue
               custom_field_id: 6
               customized_id: 3
               id: 12
               value: "11.65"
             custom_values_013:
               customized_type: Issue
               custom_field_id: 6
               customized_id: 7
               id: 13
               value: ""
             custom_values_014:
               customized_type: Issue
               custom_field_id: 6
               customized_id: 5
               id: 14
               value: "-7.6"
-  No newline at end of file
+            custom_values_015:
+              customized_type: TimeEntryActivity
+              custom_field_id: 7
+              customized_id: 10
+              id: 15
+              value: true

test/unit/enumeration_test.rb +6 -1

             # redMine - project management software
             # Copyright (C) 2006-2008  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
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             class EnumerationTest < ActiveSupport::TestCase
-              fixtures :enumerations, :issues
+              fixtures :enumerations, :issues, :custom_fields, :custom_values
               def setup
               end
               def test_objects_count
                 # low priority
                 assert_equal 5, Enumeration.find(4).objects_count
                 # urgent
                 assert_equal 0, Enumeration.find(7).objects_count
               end
               def test_in_use
                 # low priority
                 assert Enumeration.find(4).in_use?
                 # urgent
                 assert !Enumeration.find(7).in_use?
               end
               def test_default
                 e = Enumeration.default
                 assert e.is_a?(Enumeration)
                 assert e.is_default?
                 assert_equal 'Default Enumeration', e.name
               end
               def test_create
                 e = Enumeration.new(:name => 'Not default', :is_default => false)
                 e.type = 'Enumeration'
                 assert e.save
                 assert_equal 'Default Enumeration', Enumeration.default.name
               end
               def test_create_as_default
                 e = Enumeration.new(:name => 'Very urgent', :is_default => true)
                 e.type = 'Enumeration'
                 assert e.save
                 assert_equal e, Enumeration.default
               end
               def test_update_default
                 e = Enumeration.default
                 e.update_attributes(:name => 'Changed', :is_default => true)
                 assert_equal e, Enumeration.default
               end
               def test_update_default_to_non_default
                 e = Enumeration.default
                 e.update_attributes(:name => 'Changed', :is_default => false)
                 assert_nil Enumeration.default
               end
               def test_change_default
                 e = Enumeration.find_by_name('Default Enumeration')
                 e.update_attributes(:name => 'Changed Enumeration', :is_default => true)
                 assert_equal e, Enumeration.default
               end
               def test_destroy_with_reassign
                 Enumeration.find(4).destroy(Enumeration.find(6))
                 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

             # redMine - project management software
             # Copyright (C) 2006-2008  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
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             class TimeEntryActivityTest < ActiveSupport::TestCase
               fixtures :enumerations, :time_entries
               def test_should_be_an_enumeration
                 assert TimeEntryActivity.ancestors.include?(Enumeration)
               end
               def test_objects_count
                 assert_equal 3, TimeEntryActivity.find_by_name("Design").objects_count
                 assert_equal 1, TimeEntryActivity.find_by_name("Development").objects_count
               end
               def test_option_name
                 assert_equal :enumeration_activities, TimeEntryActivity.new.option_name
               end
+              def test_create_with_custom_field
+                field = TimeEntryActivityCustomField.find_by_name('Billable')
+                e = TimeEntryActivity.new(:name => 'Custom Data')
+                e.custom_field_values = {field.id => "1"}
+                assert e.save
+                e.reload
+                assert_equal "1", e.custom_value_for(field).value
+              end
+              def test_create_without_required_custom_field_should_fail
+                field = TimeEntryActivityCustomField.find_by_name('Billable')
+                field.update_attribute(:is_required, true)
+                e = TimeEntryActivity.new(:name => 'Custom Data')
+                assert !e.save
+                assert_equal I18n.translate('activerecord.errors.messages.invalid'), e.errors.on(:custom_values)
+              end
+              def test_create_with_required_custom_field_should_succeed
+                field = TimeEntryActivityCustomField.find_by_name('Billable')
+                field.update_attribute(:is_required, true)
+                e = TimeEntryActivity.new(:name => 'Custom Data')
+                e.custom_field_values = {field.id => "1"}
+                assert e.save
+              end
+              def test_update_issue_with_required_custom_field_change
+                field = TimeEntryActivityCustomField.find_by_name('Billable')
+                field.update_attribute(:is_required, true)
+                e = TimeEntryActivity.find(10)
+                assert e.available_custom_fields.include?(field)
+                # No change to custom field, record can be saved
+                assert e.save
+                # Blanking custom field, save should fail
+                e.custom_field_values = {field.id => ""}
+                assert !e.save
+                assert e.errors.on(:custom_values)
+                # Update custom field to valid value, save should succeed
+                e.custom_field_values = {field.id => "0"}
+                assert e.save
+                e.reload
+                assert_equal "0", e.custom_value_for(field).value
+              end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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