jro_apps/redmine Commit - r4978:b8b35ab05f70

Moved wiki page updated_on eager load to a scope and fixed timestamp titles on wiki page index (#7818)....

Jean-Philippe Lang -

r4978:b8b35ab05f70

parent child

Context file:

r4978:b8b35ab05f70

Collapse all files

app/controllers/wiki_controller.rb +13 -16

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  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
               # List of pages, sorted alphabetically and by parent (hierarchy)
               def index
-                load_pages_grouped_by_date_without_content
+                load_pages_for_index
+                @pages_by_parent_id = @pages.group_by(&:parent_id)
+              end
+              # List of page, by last update
+              def date_index
+                load_pages_for_index
+                @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
               end
               # display a page (in editing mode if it doesn't exist)
                   redirect_to :action => 'show', :project_id => @project, :id => nil
                 end
               end
-              def date_index
-                load_pages_grouped_by_date_without_content
-              end
               def preview
                 page = @wiki.find_page(params[:id])
                 extend helper unless self.instance_of?(helper)
                 helper.instance_method(:initial_page_content).bind(self).call(page)
               end
-              # eager load information about last updates, without loading text
-              def load_pages_grouped_by_date_without_content
-                @pages = @wiki.pages.find :all, :select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on",
-                                                :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id",
-                                                :order => 'title'
-                @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
-                @pages_by_parent_id = @pages.group_by(&:parent_id)
-              end
+              def load_pages_for_index
+                @pages = @wiki.pages.with_updated_on.all(:order => 'title', :include => {:wiki => :project})
+              end
             end

app/helpers/application_helper.rb +2 -2

             # Redmine - project management software
-            # Copyright (C) 2006-2010  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  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
                   pages[node].each do |page|
                     content << "<li>"
                     content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title},
-                                       :title => (page.respond_to?(:updated_on) ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
+                                       :title => (page.updated_on ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
                     content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id]
                     content << "</li>\n"
                   end

app/models/wiki_page.rb +18 0

@@ -41,6 +41,12 class WikiPage < ActiveRecord::Base
41	validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false	41	validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
42	validates_associated :content	42	validates_associated :content
43		43
		44	# eager load information about last updates, without loading text
		45	named_scope :with_updated_on, {
		46	:select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on",
		47	:joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id"
		48	}
		49
44	# Wiki pages that are protected by default	50	# Wiki pages that are protected by default
45	DEFAULT_PROTECTED_PAGES = %w(sidebar)	51	DEFAULT_PROTECTED_PAGES = %w(sidebar)
46		52
@@ -121,6 +127,18 class WikiPage < ActiveRecord::Base
121	content.text if content	127	content.text if content
122	end	128	end
123		129
		130	def updated_on
		131	unless @updated_on
		132	if time = read_attribute(:updated_on)
		133	# content updated_on was eager loaded with the page
		134	@updated_on = Time.parse(time) rescue nil
		135	else
		136	@updated_on = content && content.updated_on
		137	end
		138	end
		139	@updated_on
		140	end
		141
124	# Returns true if usr is allowed to edit the page, otherwise false	142	# Returns true if usr is allowed to edit the page, otherwise false
125	def editable_by?(usr)	143	def editable_by?(usr)
126	!protected? \|\| usr.allowed_to?(:protect_wiki_pages, wiki.project)	144	!protected? \|\| usr.allowed_to?(:protect_wiki_pages, wiki.project)

test/functional/wiki_controller_test.rb +3 -2

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  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
                 pages = assigns(:pages)
                 assert_not_nil pages
                 assert_equal Project.find(1).wiki.pages.size, pages.size
+                assert_equal pages.first.content.updated_on, pages.first.updated_on
                 assert_tag :ul, :attributes => { :class => 'pages-hierarchy' },
                                 :child => { :tag => 'li', :child => { :tag => 'a', :attributes => { :href => '/projects/ecookbook/wiki/CookBook_documentation' },

test/unit/wiki_page_test.rb +9 -2

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  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
                   assert_nil child.parent_id
                 end
               end
+              def test_updated_on_eager_load
+                page = WikiPage.with_updated_on.first
+                assert page.is_a?(WikiPage)
+                assert_not_nil page.read_attribute(:updated_on)
+                assert_equal page.content.updated_on, page.updated_on
+              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