소스 검색

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
tags/1.2.0
Jean-Philippe Lang 13 년 전
부모
커밋
334132289c
3개의 변경된 파일10개의 추가작업 그리고 1개의 파일을 삭제
  1. 1
    0
      app/controllers/journals_controller.rb
  2. 7
    0
      test/fixtures/journal_details.yml
  3. 2
    1
      test/functional/journals_controller_test.rb

+ 1
- 0
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

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

+ 2
- 1
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

Loading…
취소
저장