Fixed: r4492 breaks the ability to select issue custom fields available for…

Fixed: r4492 breaks the ability to select issue custom fields available for projects issues (#7121). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4529 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: r4492 breaks the ability to select issue custom fields available for…
Fixed: r4492 breaks the ability to select issue custom fields available for projects issues (#7121). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4529 e93f8b46-1217-0410-a6f0-8f06a7374b81
df88dc11 · Jean-Philippe Lang · 620c1e27 · df88dc11 · df88dc11
Commit df88dc11 authored Dec 17, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

project.rb app/models/project.rb +2 -1

projects_controller_test.rb test/functional/projects_controller_test.rb +4 -1

No files found.
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -530,7 +530,8 @@ class Project < ActiveRecord::Base
    'identifier',
    'custom_field_values',
    'custom_fields',
-    'tracker_ids'
+    'tracker_ids',
+    'issue_custom_field_ids'

  # Returns an array of projects that are in this project's hierarchy
  #

--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -152,7 +152,9 @@ class ProjectsControllerTest < ActionController::TestCase
            :identifier => "blog",
            :is_public => 1,
            :custom_field_values => { '3' => 'Beta' },
-            :tracker_ids => ['1', '3']
+            :tracker_ids => ['1', '3'],
+            # an issue custom field that is not for all project
+            :issue_custom_field_ids => ['9']
          }
        assert_redirected_to '/projects/blog/settings'
        
@@ -165,6 +167,7 @@ class ProjectsControllerTest < ActionController::TestCase
        assert_nil project.parent
        assert_equal 'Beta', project.custom_value_for(3).value
        assert_equal [1, 3], project.trackers.map(&:id).sort
+        assert project.issue_custom_fields.include?(IssueCustomField.find(9))
      end
      
      should "create a new subproject" do