Merged r5021 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5022 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
d5f1bd07b2
commit
465534a298
|
@ -23,6 +23,7 @@ class JournalsController < ApplicationController
|
||||||
accept_key_auth :index
|
accept_key_auth :index
|
||||||
|
|
||||||
helper :issues
|
helper :issues
|
||||||
|
helper :custom_fields
|
||||||
helper :queries
|
helper :queries
|
||||||
include QueriesHelper
|
include QueriesHelper
|
||||||
helper :sort
|
helper :sort
|
||||||
|
|
|
@ -20,3 +20,10 @@ journal_details_003:
|
||||||
value: "6"
|
value: "6"
|
||||||
prop_key: fixed_version_id
|
prop_key: fixed_version_id
|
||||||
journal_id: 4
|
journal_id: 4
|
||||||
|
journal_details_005:
|
||||||
|
old_value: Old value
|
||||||
|
property: cf
|
||||||
|
id: 5
|
||||||
|
value: New value
|
||||||
|
prop_key: 2
|
||||||
|
journal_id: 3
|
||||||
|
|
|
@ -22,7 +22,8 @@ require 'journals_controller'
|
||||||
class JournalsController; def rescue_action(e) raise e end; end
|
class JournalsController; def rescue_action(e) raise e end; end
|
||||||
|
|
||||||
class JournalsControllerTest < ActionController::TestCase
|
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
|
def setup
|
||||||
@controller = JournalsController.new
|
@controller = JournalsController.new
|
||||||
|
|
Loading…
Reference in New Issue