Fixed: Wiki#find_page should not be case sensitive because page title uniqueness is not (#6987).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4430 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: Wiki#find_page should not be case sensitive because page title uniqueness is not (#6987).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4430 e93f8b46-1217-0410-a6f0-8f06a7374b81
97140f6a · Jean-Philippe Lang · 4a6a551d · 97140f6a · 97140f6a · 97140f6a
Commit 97140f6a authored Nov 27, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 4 deletions

wiki.rb app/models/wiki.rb +3 -3

wiki_redirect_test.rb test/unit/wiki_redirect_test.rb +2 -1

wiki_test.rb test/unit/wiki_test.rb +9 -0

No files found.
--- a/app/models/wiki.rb
+++ b/app/models/wiki.rb
@@ -45,11 +45,11 @@ class Wiki < ActiveRecord::Base
  # find the page with the given title
  def find_page(title, options = {})
    title = start_page if title.blank?
-    title = Wiki.titleize(title)
-    page = pages.find_by_title(title)
+    title = Wiki.titleize(title).downcase
+    page = pages.first(:conditions => ["LOWER(title) LIKE ?", title])
    if !page && !(options[:with_redirect] == false)
      # search for a redirect
-      redirect = redirects.find_by_title(title)
+      redirect = redirects.first(:conditions => ["LOWER(title) LIKE ?", title])
      page = find_page(redirect.redirects_to, :with_redirect => false) if redirect
    end
    page

--- a/test/unit/wiki_redirect_test.rb
+++ b/test/unit/wiki_redirect_test.rb
@@ -18,7 +18,7 @@
 require File.dirname(__FILE__) + '/../test_helper'

 class WikiRedirectTest < ActiveSupport::TestCase
-  fixtures :projects, :wikis
+  fixtures :projects, :wikis, :wiki_pages

  def setup
    @wiki = Wiki.find(1)
@@ -33,6 +33,7 @@ class WikiRedirectTest < ActiveSupport::TestCase
    assert_equal 'New_title', @original.title
    assert @wiki.redirects.find_by_title('Original_title')
    assert @wiki.find_page('Original title')
+    assert @wiki.find_page('ORIGINAL title')
  end
  
  def test_update_redirect

--- a/test/unit/wiki_test.rb
+++ b/test/unit/wiki_test.rb
@@ -39,6 +39,15 @@ class WikiTest < ActiveSupport::TestCase
    assert_equal "Another start page", @wiki.start_page
  end
  
+  def test_find_page
+    wiki = Wiki.find(1)
+    page = WikiPage.find(2)
+    
+    assert_equal page, wiki.find_page('Another_page')
+    assert_equal page, wiki.find_page('Another page')
+    assert_equal page, wiki.find_page('ANOTHER page')
+  end
+  
  def test_titleize
    assert_equal 'Page_title_with_CAPITALES', Wiki.titleize('page title with CAPITALES')
    assert_equal 'テスト', Wiki.titleize('テスト')