Fixed: error on JournalsController#index when custom fields are present (#7795).

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

diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 37e52ca53b61ae95439caac1b2680169fff35f40..9eed2eacac043147ae62116db5b6e29ab68870fe 100644 (file)
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -24,6 +24,7 @@ class JournalsController < ApplicationController
   menu_item :issues
   
   helper :issues
+  helper :custom_fields
   helper :queries
   include QueriesHelper
   helper :sort

diff --git a/test/fixtures/journal_details.yml b/test/fixtures/journal_details.yml
index 5b2c651b2e689853f9ddedfbf9dcb2f070f6d85f..8077d7cde162d55e689117f5eda63eb2e8e7dcd1 100644 (file)
--- a/test/fixtures/journal_details.yml
+++ b/test/fixtures/journal_details.yml
@@ -27,3 +27,10 @@ journal_details_004:
   value: "This word was and an other was added"
   prop_key: description
   journal_id: 3
+journal_details_005:
+  old_value: Old value
+  property: cf
+  id: 5
+  value: New value
+  prop_key: 2
+  journal_id: 3

diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb
index 2060e9c7ae942dca74d64ac4029a644b10f78061..fa29744e1d9b184dcbcf4a9e3523d4408f5fbb95 100644 (file)
--- a/test/functional/journals_controller_test.rb
+++ b/test/functional/journals_controller_test.rb
@@ -22,7 +22,8 @@ require 'journals_controller'
 class JournalsController; def rescue_action(e) raise e end; end
 
 class JournalsControllerTest < ActionController::TestCase
-  fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :journal_details, :enabled_modules
+  fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :journal_details, :enabled_modules,
+    :trackers, :issue_statuses, :enumerations, :custom_fields, :custom_values, :custom_fields_projects
   
   def setup
     @controller = JournalsController.new