summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-05-02 13:19:16 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-05-02 13:19:16 +0000
commit1446c9b7f00109d31a48aa1ed8aea44a8db5e9f6 (patch)
tree34b74de587972689a866b24c9a88faa46a91d229
parent9be6dfbe106957818889449972321fb36ac377b6 (diff)
downloadredmine-1446c9b7f00109d31a48aa1ed8aea44a8db5e9f6.tar.gz
redmine-1446c9b7f00109d31a48aa1ed8aea44a8db5e9f6.zip
scm: fix git and mercurial branch list box action
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9612 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/application_helper.rb3
-rw-r--r--test/unit/helpers/application_helper_test.rb7
2 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7e528eb1a..a57157c29 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -369,7 +369,8 @@ module ApplicationHelper
end
def to_path_param(path)
- path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
+ str = path.to_s.split(%r{[/\\]}).select{|p| !p.blank?}.join("/")
+ str.blank? ? nil : str
end
def pagination_links_full(paginator, count=nil, options={})
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 6dea2cf57..1a9d4642a 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -725,6 +725,13 @@ EXPECTED
assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
end
+ def test_to_path_param
+ assert_equal 'test1/test2', to_path_param('test1/test2')
+ assert_equal 'test1/test2', to_path_param('/test1/test2/')
+ assert_equal 'test1/test2', to_path_param('//test1/test2/')
+ assert_equal nil, to_path_param('/')
+ end
+
def test_wiki_links_in_tables
to_test = {"|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" =>
'<tr><td><a href="/projects/ecookbook/wiki/Page" class="wiki-page new">Link title</a></td>' +