Serve a file if in wiki.

Marin Jankovski
1 parent 1feaa336
Showing 1 changed file with 11 additions and 0 deletions Show diff stats
app/controllers/projects/wikis_controller.rb
@@ -15,6 +15,17 @@ class Projects::WikisController &lt; Projects::ApplicationController
  
     if @page
       render 'show'
+    elsif file = @project_wiki.wiki.file(params[:id], @project_wiki.wiki.ref, true)
+       if file.on_disk?
+         send_file file.on_disk_path, :disposition => 'inline'
+       else
+          send_data(
+            file.raw_data,
+            type: file.mime_type,
+            disposition: 'inline',
+            filename: file.name
+          )
+       end
     else
       return render('empty') unless can?(current_user, :write_wiki, @project)
       @page = WikiPage.new(@project_wiki)
...	...	@@ -15,6 +15,17 @@ class Projects::WikisController < Projects::ApplicationController
15	15
16	16	if @page
17	17	render 'show'
	18	+ elsif file = @project_wiki.wiki.file(params[:id], @project_wiki.wiki.ref, true)
	19	+ if file.on_disk?
	20	+ send_file file.on_disk_path, :disposition => 'inline'
	21	+ else
	22	+ send_data(
	23	+ file.raw_data,
	24	+ type: file.mime_type,
	25	+ disposition: 'inline',
	26	+ filename: file.name
	27	+ )
	28	+ end
18	29	else
19	30	return render('empty') unless can?(current_user, :write_wiki, @project)
20	31	@page = WikiPage.new(@project_wiki)
...	...