From 465534a2989da5a0f87cd572b60061f5db5da31a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Mar 2011 16:12:27 +0000
Subject: [PATCH] Merged r5021 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5022 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/journals_controller.rb      | 1 +
 test/fixtures/journal_details.yml           | 7 +++++++
 test/functional/journals_controller_test.rb | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 189204e26..d11b2b6fe 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -23,6 +23,7 @@ class JournalsController < ApplicationController
   accept_key_auth :index
 
   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 046202dd3..88d8c7798 100644
--- a/test/fixtures/journal_details.yml
+++ b/test/fixtures/journal_details.yml
@@ -20,3 +20,10 @@ journal_details_003:
   value: "6"
   prop_key: fixed_version_id
   journal_id: 4
+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 ff123f915..6628cbbb8 100644
--- 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