@@ -284,7 +284,9 class WikiController < ApplicationController | |||||
284 | send_data(export, :type => 'text/html', :filename => "wiki.html") |
|
284 | send_data(export, :type => 'text/html', :filename => "wiki.html") | |
285 | } |
|
285 | } | |
286 | format.pdf { |
|
286 | format.pdf { | |
287 |
send_data(wiki_pages_to_pdf(@pages, @project), |
|
287 | send_data(wiki_pages_to_pdf(@pages, @project), | |
|
288 | :type => 'application/pdf', | |||
|
289 | :filename => "#{@project.identifier}.pdf") | |||
288 | } |
|
290 | } | |
289 | end |
|
291 | end | |
290 | end |
|
292 | end | |
@@ -351,6 +353,10 private | |||||
351 | end |
|
353 | end | |
352 |
|
354 | |||
353 | def load_pages_for_index |
|
355 | def load_pages_for_index | |
354 | @pages = @wiki.pages.with_updated_on.reorder("#{WikiPage.table_name}.title").includes(:wiki => :project).includes(:parent).all |
|
356 | @pages = @wiki.pages.with_updated_on. | |
|
357 | reorder("#{WikiPage.table_name}.title"). | |||
|
358 | includes(:wiki => :project). | |||
|
359 | includes(:parent). | |||
|
360 | all | |||
355 | end |
|
361 | end | |
356 | end |
|
362 | end |
General Comments 0
You need to be logged in to leave comments.
Login now