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

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
784bbccf · Jean-Philippe Lang · Eric Davis · ca4dcce8 · 784bbccf · 784bbccf
Commit 784bbccf authored Mar 06, 2011 by Jean-Philippe Lang Committed by Eric Davis Apr 16, 2011
Showing with 10 additions and 1 deletion

journals_controller.rb app/controllers/journals_controller.rb +1 -0

journal_details.yml test/fixtures/journal_details.yml +7 -0

journals_controller_test.rb test/functional/journals_controller_test.rb +2 -1

No files found.
--- 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

--- 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
--- 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