Make use of tracker_ids association in issue custom field form.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2272 e93f8b46-1217-0410-a6f0-8f06a7374b81

Make use of tracker_ids association in issue custom field form.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2272 e93f8b46-1217-0410-a6f0-8f06a7374b81
5ed2e78a · Jean-Philippe Lang · d1a1e25b · 5ed2e78a · 5ed2e78a · 5ed2e78a
Commit 5ed2e78a authored Jan 17, 2009 by Jean-Philippe Lang
3 changed files
--- a/app/controllers/custom_fields_controller.rb
+++ b/app/controllers/custom_fields_controller.rb
@@ -33,7 +33,6 @@ class CustomFieldsController < ApplicationController
    case params[:type]
      when "IssueCustomField" 
        @custom_field = IssueCustomField.new(params[:custom_field])
-        @custom_field.trackers = Tracker.find(params[:tracker_ids]) if params[:tracker_ids]
      when "UserCustomField" 
        @custom_field = UserCustomField.new(params[:custom_field])
      when "ProjectCustomField" 
@@ -54,9 +53,6 @@ class CustomFieldsController < ApplicationController
  def edit
    @custom_field = CustomField.find(params[:id])
    if request.post? and @custom_field.update_attributes(params[:custom_field])
-      if @custom_field.is_a? IssueCustomField
-        @custom_field.trackers = params[:tracker_ids] ? Tracker.find(params[:tracker_ids]) : []
-      end
      flash[:notice] = l(:notice_successful_update)
      redirect_to :action => 'list', :tab => @custom_field.class.name
    end

--- a/app/views/custom_fields/_form.rhtml
+++ b/app/views/custom_fields/_form.rhtml
@@ -67,13 +67,14 @@ function toggle_custom_field_format() {
 </div>

 <div class="box">
-<% case @custom_field.type.to_s
+<% case @custom_field.class.name
 when "IssueCustomField" %>
    
    <fieldset><legend><%=l(:label_tracker_plural)%></legend>
    <% for tracker in @trackers %>
-        <%= check_box_tag "tracker_ids[]", tracker.id, (@custom_field.trackers.include? tracker) %> <%= tracker.name %>
+        <%= 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>

--- a/test/functional/custom_fields_controller_test.rb
+++ b/test/functional/custom_fields_controller_test.rb
@@ -34,7 +34,6 @@ class CustomFieldsControllerTest < Test::Unit::TestCase
  def test_post_new_list_custom_field
    assert_difference 'CustomField.count' do
      post :new, :type => "IssueCustomField",
-                 :tracker_ids => ["1"],
                 :custom_field => {:name => "test_post_new_list",
                                   :default_value => "",
                                   :min_length => "0",
@@ -45,7 +44,8 @@ class CustomFieldsControllerTest < Test::Unit::TestCase
                                   :max_length => "0",
                                   :is_filter => "0",
                                   :is_required =>"0",
-                                   :field_format => "list"}
+                                   :field_format => "list",
+                                   :tracker_ids => ["1", ""]}
    end        
    assert_redirected_to '/custom_fields/list'
    field = IssueCustomField.find_by_name('test_post_new_list')