diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-01-20 19:46:28 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-01-20 19:46:28 +0000 |
commit | 83e45cad9f6a566147fdb4d05d1d6a0a7bfad98e (patch) | |
tree | d5a4432885770504ce6d81801fbbbc08cd771234 | |
parent | fbf30eec7c58786d615852bc17ffe5a1c49229b6 (diff) | |
download | redmine-83e45cad9f6a566147fdb4d05d1d6a0a7bfad98e.tar.gz redmine-83e45cad9f6a566147fdb4d05d1d6a0a7bfad98e.zip |
Fixed: Git: Mercurial: Branch dropdown broken on repositories page (#10026).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8678 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r-- | app/views/repositories/_navigation.html.erb | 2 | ||||
-rw-r--r-- | test/functional/repositories_mercurial_controller_test.rb | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/views/repositories/_navigation.html.erb b/app/views/repositories/_navigation.html.erb index 1776d2b7e..ba38fed1a 100644 --- a/app/views/repositories/_navigation.html.erb +++ b/app/views/repositories/_navigation.html.erb @@ -10,7 +10,7 @@ :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), - :rev => ''}, + :rev => nil}, {:method => :get, :id => 'revision_selector'}) do -%> <!-- Branches Dropdown --> <% if !@repository.branches.nil? && @repository.branches.length > 0 -%> diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb index 2792a3fdb..9218b4c8a 100644 --- a/test/functional/repositories_mercurial_controller_test.rb +++ b/test/functional/repositories_mercurial_controller_test.rb @@ -163,6 +163,16 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase end end + def show_should_show_branch_selection_form + @repository.fetch_changesets + @project.reload + get :show, :id => PRJ_ID + assert_tag 'form', :attributes => {:id => 'revision_selector', :action => '/projects/subproject1/repository/show'} + assert_tag 'select', :attributes => {:name => 'branch'}, + :child => {:tag => 'option', :attributes => {:value => 'test-branch-01'}}, + :parent => {:tag => 'form', :attributes => {:id => 'revision_selector'}} + end + def test_show_branch assert_equal 0, @repository.changesets.count @repository.fetch_changesets |