summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-01-11 05:51:18 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-01-11 05:51:18 +0000
commit2066969c7d8377af1cf2dfef0eac30cce37bbdc0 (patch)
tree4e71b4982a7268736d31ac72a4ac9ed1e1fef2a9 /app
parent3e17eb2956a5566b5852c901c5743a32ac2c1dd7 (diff)
downloadredmine-2066969c7d8377af1cf2dfef0eac30cce37bbdc0.tar.gz
redmine-2066969c7d8377af1cf2dfef0eac30cce37bbdc0.zip
code format cleanup WikiController
git-svn-id: http://svn.redmine.org/redmine/trunk@12618 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/wiki_controller.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 42a60efc5..22f075f60 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -284,7 +284,9 @@ class WikiController < ApplicationController
send_data(export, :type => 'text/html', :filename => "wiki.html")
}
format.pdf {
- send_data(wiki_pages_to_pdf(@pages, @project), :type => 'application/pdf', :filename => "#{@project.identifier}.pdf")
+ send_data(wiki_pages_to_pdf(@pages, @project),
+ :type => 'application/pdf',
+ :filename => "#{@project.identifier}.pdf")
}
end
end
@@ -351,6 +353,10 @@ private
end
def load_pages_for_index
- @pages = @wiki.pages.with_updated_on.reorder("#{WikiPage.table_name}.title").includes(:wiki => :project).includes(:parent).all
+ @pages = @wiki.pages.with_updated_on.
+ reorder("#{WikiPage.table_name}.title").
+ includes(:wiki => :project).
+ includes(:parent).
+ all
end
end