summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-01-11 06:03:38 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-01-11 06:03:38 +0000
commit7484cf07b65678eebfe099fb98d0e4157008bb52 (patch)
tree894ee41074fee67242030187982f857c04c882e2
parent39ceaa7d55ce2cb479750fad570a59f309c97263 (diff)
downloadredmine-7484cf07b65678eebfe099fb98d0e4157008bb52.tar.gz
redmine-7484cf07b65678eebfe099fb98d0e4157008bb52.zip
cleanup syntax of Relation#all at WikiController#export
git-svn-id: http://svn.redmine.org/redmine/trunk@12620 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/wiki_controller.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 22f075f60..c68f15afd 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -277,7 +277,10 @@ class WikiController < ApplicationController
# Export wiki to a single pdf or html file
def export
- @pages = @wiki.pages.all(:order => 'title', :include => [:content, {:attachments => :author}])
+ @pages = @wiki.pages.
+ order('title').
+ includes([:content, {:attachments => :author}]).
+ all
respond_to do |format|
format.html {
export = render_to_string :action => 'export_multiple', :layout => false