Speed up loading and add pagination to wiki pages page.

Marin Jankovski
1 parent 415c0f4b
Showing 3 changed files with 8 additions and 5 deletions Show diff stats
app/controllers/projects/wikis_controller.rb
app/models/wiki_page.rb
app/views/projects/wikis/pages.html.haml
@@ -7,7 +7,7 @@ class Projects::WikisController &lt; Projects::ApplicationController
   before_filter :load_project_wiki
  
   def pages
-    @wiki_pages = @project_wiki.pages
+    @wiki_pages = Kaminari.paginate_array(@project_wiki.pages).page(params[:page]).per(30)
   end
  
   def show
@@ -57,12 +57,16 @@ class WikiPage
  
   # The raw content of this page.
   def content
-    @attributes[:content]
+    @attributes[:content] ||= if @page
+                                @page.raw_data
+                              end
   end
  
   # The processed/formatted content of this page.
   def formatted_content
-    @attributes[:formatted_content]
+    @attributes[:formatted_content] ||= if @page
+                                          @page.formatted_data
+                                        end
   end
  
   # The markup format for the page.
@@ -163,8 +167,6 @@ class WikiPage
   def set_attributes
     attributes[:slug] = @page.escaped_url_path
     attributes[:title] = @page.title
-    attributes[:content] = @page.raw_data
-    attributes[:formatted_content] = @page.formatted_data
     attributes[:format] = @page.format
   end
  
@@ -9,3 +9,4 @@
         %small (#{wiki_page.format})
         .pull-right
           %small Last edited #{time_ago_with_tooltip(wiki_page.commit.created_at)}
+= paginate @wiki_pages, theme: 'gitlab'
...	...	@@ -7,7 +7,7 @@ class Projects::WikisController < Projects::ApplicationController
7	7	before_filter :load_project_wiki
8	8
9	9	def pages
10		- @wiki_pages = @project_wiki.pages
	10	+ @wiki_pages = Kaminari.paginate_array(@project_wiki.pages).page(params[:page]).per(30)
11	11	end
12	12
13	13	def show
...	...
...	...	@@ -57,12 +57,16 @@ class WikiPage
57	57
58	58	# The raw content of this page.
59	59	def content
60		- @attributes[:content]
	60	+ @attributes[:content] \|\|= if @page
	61	+ @page.raw_data
	62	+ end
61	63	end
62	64
63	65	# The processed/formatted content of this page.
64	66	def formatted_content
65		- @attributes[:formatted_content]
	67	+ @attributes[:formatted_content] \|\|= if @page
	68	+ @page.formatted_data
	69	+ end
66	70	end
67	71
68	72	# The markup format for the page.
...	...	@@ -163,8 +167,6 @@ class WikiPage
163	167	def set_attributes
164	168	attributes[:slug] = @page.escaped_url_path
165	169	attributes[:title] = @page.title
166		- attributes[:content] = @page.raw_data
167		- attributes[:formatted_content] = @page.formatted_data
168	170	attributes[:format] = @page.format
169	171	end
170	172
...	...
...	...	@@ -9,3 +9,4 @@
9	9	%small (#{wiki_page.format})
10	10	.pull-right
11	11	%small Last edited #{time_ago_with_tooltip(wiki_page.commit.created_at)}
	12	+= paginate @wiki_pages, theme: 'gitlab'
...	...