jro_apps/redmine Commit - r4560:f1a5dca2ba84

Fixed: wiki pages with cyrillic characters not found with postgresql (#7245)....

Jean-Philippe Lang -

r4560:f1a5dca2ba84

parent child

Context file:

r4560:f1a5dca2ba84

Collapse all files

app/models/wiki.rb +3 -3

             # Redmine - project management software
             # Copyright (C) 2006-2009  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Wiki < ActiveRecord::Base
               belongs_to :project
               has_many :pages, :class_name => 'WikiPage', :dependent => :destroy, :order => 'title'
               has_many :redirects, :class_name => 'WikiRedirect', :dependent => :delete_all
               acts_as_watchable
               validates_presence_of :start_page
               validates_format_of :start_page, :with => /^[^,\.\/\?\;\|\:]*$/
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_wiki_pages, project)
               end
               # Returns the wiki page that acts as the sidebar content
               # or nil if no such page exists
               def sidebar
                 @sidebar ||= find_page('Sidebar', :with_redirect => false)
               end
               # find the page with the given title
               # if page doesn't exist, return a new page
               def find_or_new_page(title)
                 title = start_page if title.blank?
                 find_page(title) || WikiPage.new(:wiki => self, :title => Wiki.titleize(title))
               end
               # find the page with the given title
               def find_page(title, options = {})
                 title = start_page if title.blank?
-                title = Wiki.titleize(title).downcase
+                title = Wiki.titleize(title)
-                page = pages.first(:conditions => ["LOWER(title) LIKE ?", title])
+                page = pages.first(:conditions => ["LOWER(title) LIKE LOWER(?)", title])
                 if !page && !(options[:with_redirect] == false)
                   # search for a redirect
-                  redirect = redirects.first(:conditions => ["LOWER(title) LIKE ?", title])
+                  redirect = redirects.first(:conditions => ["LOWER(title) LIKE LOWER(?)", title])
                   page = find_page(redirect.redirects_to, :with_redirect => false) if redirect
                 end
                 page
               end
               # Finds a page by title
               # The given string can be of one of the forms: "title" or "project:title"
               # Examples:
               #   Wiki.find_page("bar", project => foo)
               #   Wiki.find_page("foo:bar")
               def self.find_page(title, options = {})
                 project = options[:project]
                 if title.to_s =~ %r{^([^\:]+)\:(.*)$}
                   project_identifier, title = $1, $2
                   project = Project.find_by_identifier(project_identifier) || Project.find_by_name(project_identifier)
                 end
                 if project && project.wiki
                   page = project.wiki.find_page(title)
                   if page && page.content
                     page
                   end
                 end
               end
               # turn a string into a valid page title
               def self.titleize(title)
                 # replace spaces with _ and remove unwanted caracters
                 title = title.gsub(/\s+/, '_').delete(',./?;|:') if title
                 # upcase the first letter
                 title = (title.slice(0..0).upcase + (title.slice(1..-1) || '')) if title
                 title
               end
             end

test/fixtures/wiki_pages.yml +7 -1

             ---
             wiki_pages_001:
               created_on: 2007-03-07 00:08:07 +01:00
               title: CookBook_documentation
               id: 1
               wiki_id: 1
               protected: true
               parent_id:
             wiki_pages_002:
               created_on: 2007-03-08 00:18:07 +01:00
               title: Another_page
               id: 2
               wiki_id: 1
               protected: false
               parent_id:
             wiki_pages_003:
               created_on: 2007-03-08 00:18:07 +01:00
               title: Start_page
               id: 3
               wiki_id: 2
               protected: false
               parent_id:
             wiki_pages_004:
               created_on: 2007-03-08 00:18:07 +01:00
               title: Page_with_an_inline_image
               id: 4
               wiki_id: 1
               protected: false
               parent_id: 1
             wiki_pages_005:
               created_on: 2007-03-08 00:18:07 +01:00
               title: Child_1
               id: 5
               wiki_id: 1
               protected: false
               parent_id: 2
             wiki_pages_006:
               created_on: 2007-03-08 00:18:07 +01:00
               title: Child_2
               id: 6
               wiki_id: 1
               protected: false
               parent_id: 2
             wiki_pages_007:
               created_on: 2007-03-08 00:18:07 +01:00
               title: Child_page_1
               id: 7
               wiki_id: 2
               protected: false
               parent_id: 8
             wiki_pages_008:
               created_on: 2007-03-08 00:18:07 +01:00
               title: Parent_page
               id: 8
               wiki_id: 2
               protected: false
               parent_id:
             wiki_pages_009:
               created_on: 2007-03-08 00:18:07 +01:00
               title: Child_page_2
               id: 9
               wiki_id: 2
               protected: false
               parent_id: 8
-  No newline at end of file
+            wiki_pages_010:
+              created_on: 2007-03-08 00:18:07 +01:00
+              title: Этика_менеджмента
+              id: 10
+              wiki_id: 1
+              protected: false
+              parent_id:

test/unit/wiki_test.rb +3 0

             # encoding: utf-8
             #
             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class WikiTest < ActiveSupport::TestCase
               fixtures :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions
               def test_create
                 wiki = Wiki.new(:project => Project.find(2))
                 assert !wiki.save
                 assert_equal 1, wiki.errors.count
                 wiki.start_page = "Start page"
                 assert wiki.save
               end
               def test_update
                 @wiki = Wiki.find(1)
                 @wiki.start_page = "Another start page"
                 assert @wiki.save
                 @wiki.reload
                 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')
+                page = WikiPage.find(10)
+                assert_equal page, wiki.find_page('Этика_менеджмента')
               end
               def test_titleize
                 assert_equal 'Page_title_with_CAPITALES', Wiki.titleize('page title with CAPITALES')
                 assert_equal 'テスト', Wiki.titleize('テスト')
               end
               context "#sidebar" do
                 setup do
                   @wiki = Wiki.find(1)
                 end
                 should "return nil if undefined" do
                   assert_nil @wiki.sidebar
                 end
                 should "return a WikiPage if defined" do
                   page = @wiki.pages.new(:title => 'Sidebar')
                   page.content = WikiContent.new(:text => 'Side bar content for test_show_with_sidebar')
                   page.save!
                   assert_kind_of WikiPage, @wiki.sidebar
                   assert_equal 'Sidebar', @wiki.sidebar.title
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages