GitLab wurde aktualisiert. Dank regelmäßiger Updates bleibt das THM GitLab sicher und Sie profitieren von den neuesten Funktionen. Vielen Dank für Ihre Geduld.

Commit ebb444de authored by jplang's avatar jplang
Browse files

Don't prepend project name if the version is not shared.

git-svn-id: https://svn.redmine.org/redmine/trunk@13325 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 73c6e9cd
......@@ -247,7 +247,7 @@ module ApplicationHelper
end
def format_version_name(version)
if version.project == @project
if !version.shared? || version.project == @project
h(version)
else
h("#{version.project} - #{version}")
......
......@@ -226,6 +226,11 @@ class Version < ActiveRecord::Base
end
end
# Returns true if the version is shared, otherwise false
def shared?
sharing != 'none'
end
private
def load_issue_counts
......
......@@ -816,7 +816,7 @@ class IssuesControllerTest < ActionController::TestCase
def test_index_with_fixed_version_column
get :index, :set_filter => 1, :c => %w(fixed_version)
assert_select 'table.issues td.fixed_version' do
assert_select 'a[href=?]', '/versions/2', :text => 'eCookbook - 1.0'
assert_select 'a[href=?]', '/versions/2', :text => '1.0'
end
end
......
......@@ -47,18 +47,18 @@ class ProjectsHelperTest < ActionView::TestCase
def test_link_to_version
User.current = User.find(1)
assert_equal '<a href="/versions/5" title="07/01/2006">OnlineStore - Alpha</a>', link_to_version(Version.find(5))
assert_equal '<a href="/versions/5" title="07/01/2006">Alpha</a>', link_to_version(Version.find(5))
end
def test_link_to_version_without_effective_date
User.current = User.find(1)
version = Version.find(5)
version.effective_date = nil
assert_equal '<a href="/versions/5">OnlineStore - Alpha</a>', link_to_version(version)
assert_equal '<a href="/versions/5">Alpha</a>', link_to_version(version)
end
def test_link_to_private_version
assert_equal 'OnlineStore - Alpha', link_to_version(Version.find(5))
assert_equal 'Alpha', link_to_version(Version.find(5))
end
def test_link_to_version_invalid_version
......@@ -71,11 +71,20 @@ class ProjectsHelperTest < ActionView::TestCase
end
def test_format_version_name
assert_equal "eCookbook - 0.1", format_version_name(Version.find(1))
assert_equal "0.1", format_version_name(Version.find(1))
end
def test_format_version_name_for_shared_version_within_project_should_not_display_project_name
@project = Project.find(1)
version = Version.find(1)
version.sharing = 'system'
assert_equal "0.1", format_version_name(version)
end
def test_format_version_name_for_system_version
assert_equal "OnlineStore - Systemwide visible version", format_version_name(Version.find(7))
def test_format_version_name_for_shared_version_should_display_project_name
version = Version.find(1)
version.sharing = 'system'
assert_equal "eCookbook - 0.1", format_version_name(version)
end
def test_version_options_for_select_with_no_versions
......
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