diff options
Diffstat (limited to 'app/controllers/repositories_controller.rb')
| -rw-r--r-- | app/controllers/repositories_controller.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 235754770..8ff464c5b 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -106,7 +106,14 @@ class RepositoriesController < ApplicationController def diff @rev_to = params[:rev_to] ? params[:rev_to].to_i : (@rev - 1) - @diff_type = ('sbs' == params[:type]) ? 'sbs' : 'inline' + @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline' + @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type) + + # Save diff type as user preference + if User.current.logged? && @diff_type != User.current.pref[:diff_type] + User.current.pref[:diff_type] = @diff_type + User.current.preference.save + end @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}") unless read_fragment(@cache_key) |