diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-03-06 16:04:35 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-03-06 16:04:35 +0000 |
| commit | 334132289ca9750cc15e5a24ebb459feda384900 (patch) | |
| tree | 9465b432683f1cd4fa03b55b65f2e7729358d74e | |
| parent | 0df520961cccc0b874007082db78c65a96ae8e13 (diff) | |
| download | redmine-334132289ca9750cc15e5a24ebb459feda384900.tar.gz redmine-334132289ca9750cc15e5a24ebb459feda384900.zip | |
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
| -rw-r--r-- | app/controllers/journals_controller.rb | 1 | ||||
| -rw-r--r-- | test/fixtures/journal_details.yml | 7 | ||||
| -rw-r--r-- | test/functional/journals_controller_test.rb | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index 37e52ca53..9eed2eaca 100644 --- 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 5b2c651b2..8077d7cde 100644 --- 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 2060e9c7a..fa29744e1 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 |