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

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

diff --git a/app/models/project.rb b/app/models/project.rb
index 29a750fe2592e8a6b8d11230241bee10c4e0a501..355ae3a4cf5bc7ab7c3d0573df0b8982f6a8436d 100644 (file)
--- 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
   #

diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index ba0a3aae82985b3f17441a73e37a48d1c57692a5..1e0aaaaa3ba9944543177488b1980228d3d94ba9 100644 (file)
--- 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