attachment: add a new feature to switch "side by side" and "inline" for patches (#9612)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7860 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-20 06:13:26 +00:00
parent 700c6de3db
commit 245b534c83
2 changed files with 11 additions and 2 deletions
@@ -27,6 +27,8 @@ class AttachmentsController < ApplicationController
      format.html {
        if @attachment.is_diff?
          @diff = File.new(@attachment.diskfile, "rb").read
+          @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
+          @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
          render :action => 'diff'
        elsif @attachment.is_text? && @attachment.filesize <= Setting.file_max_size_displayed.to_i.kilobyte
          @content = File.new(@attachment.diskfile, "rb").read