Commit 0527bb48 authored by jplang's avatar jplang

Fixed that settings raises an error if not trackers exist (#11467).

git-svn-id: https://svn.redmine.org/redmine/trunk@10067 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent a2a85152
......@@ -92,12 +92,20 @@ class Tracker < ActiveRecord::Base
# Returns the fields that are disabled for all the given trackers
def self.disabled_core_fields(trackers)
trackers.uniq.map(&:disabled_core_fields).reduce(:&)
if trackers.present?
trackers.uniq.map(&:disabled_core_fields).reduce(:&)
else
[]
end
end
# Returns the fields that are enabled for one tracker at least
def self.core_fields(trackers)
trackers.uniq.map(&:core_fields).reduce(:|)
if trackers.present?
trackers.uniq.map(&:core_fields).reduce(:|)
else
CORE_FIELDS.dup
end
end
private
......
......@@ -66,6 +66,13 @@ class SettingsControllerTest < ActionController::TestCase
end
end
def test_get_edit_without_trackers_should_succeed
Tracker.delete_all
get :edit
assert_response :success
end
def test_post_edit_notifications
post :edit, :settings => {:mail_from => 'functional@test.foo',
:bcc_recipients => '0',
......
......@@ -83,6 +83,11 @@ class TrackerTest < ActiveSupport::TestCase
assert_equal Tracker::CORE_FIELDS - %w(assigned_to_id due_date done_ratio), Tracker.disabled_core_fields(trackers)
end
def test_core_fields_should_return_all_fields_for_an_empty_argument
assert_equal Tracker::CORE_FIELDS, Tracker.core_fields([])
assert_equal [], Tracker.disabled_core_fields([])
end
def test_sort_should_sort_by_position
a = Tracker.new(:name => 'Tracker A', :position => 2)
b = Tracker.new(:name => 'Tracker B', :position => 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment