comparison app/controllers/.svn/text-base/repositories_controller.rb.svn-base @ 507:0c939c159af4 redmine-1.2

Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)
author Chris Cannam
date Thu, 14 Jul 2011 10:32:19 +0100
parents cbce1fd3b1b7
children 851510f1b535
comparison
equal deleted inserted replaced
441:cbce1fd3b1b7 507:0c939c159af4
28 default_search_scope :changesets 28 default_search_scope :changesets
29 29
30 before_filter :find_repository, :except => :edit 30 before_filter :find_repository, :except => :edit
31 before_filter :find_project, :only => :edit 31 before_filter :find_project, :only => :edit
32 before_filter :authorize 32 before_filter :authorize
33 accept_key_auth :revisions 33 accept_rss_auth :revisions
34 34
35 rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed 35 rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
36 36
37 def edit 37 def edit
38 @repository = @project.repository 38 @repository = @project.repository
206 if User.current.logged? && @diff_type != User.current.pref[:diff_type] 206 if User.current.logged? && @diff_type != User.current.pref[:diff_type]
207 User.current.pref[:diff_type] = @diff_type 207 User.current.pref[:diff_type] = @diff_type
208 User.current.preference.save 208 User.current.preference.save
209 end 209 end
210 @cache_key = "repositories/diff/#{@repository.id}/" + 210 @cache_key = "repositories/diff/#{@repository.id}/" +
211 Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}") 211 Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}-#{current_language}")
212 unless read_fragment(@cache_key) 212 unless read_fragment(@cache_key)
213 @diff = @repository.diff(@path, @rev, @rev_to) 213 @diff = @repository.diff(@path, @rev, @rev_to)
214 show_error_not_found unless @diff 214 show_error_not_found unless @diff
215 end 215 end
216 216