[refs #90] fixed diff view

This commit is contained in:
Alexander Machehin 2012-06-08 13:53:30 +06:00
parent 5f50bacbe6
commit bf11afca4c
1 changed files with 14 additions and 13 deletions

View File

@ -1,17 +1,18 @@
#diff.tab-pane
.leftside
-total_additions = @stats.inject(0) {|sum, n| sum + n.additions}
-total_deletions = @stats.inject(0) {|sum, n| sum + n.deletions}
%h5= t("layout.projects.diff_show_header",
:files => t("layout.projects.commit_files_count", :count => @stats.count),
:additions => t("layout.projects.commit_additions_count", :count => total_additions),
:deletions => t("layout.projects.commit_deletions_count", :count => total_deletions))
.both
-begin
= render_diff_stats(@stats)
= render :partial => 'pull_diff', :collection => @diff
- rescue Grit::Git::GitTimeout
%p= t 'layout.git.repositories.commit_diff_too_big'
#repo-wrapper
.leftside
-total_additions = @stats.inject(0) {|sum, n| sum + n.additions}
-total_deletions = @stats.inject(0) {|sum, n| sum + n.deletions}
%h5= t("layout.projects.diff_show_header",
:files => t("layout.projects.commit_files_count", :count => @stats.count),
:additions => t("layout.projects.commit_additions_count", :count => total_additions),
:deletions => t("layout.projects.commit_deletions_count", :count => total_deletions))
.both
-begin
= render_diff_stats(@stats)
= render :partial => 'pull_diff', :collection => @diff
- rescue Grit::Git::GitTimeout
%p= t 'layout.git.repositories.commit_diff_too_big'
#commits.tab-pane
= render :partial => 'projects/git/commits/commits', :object => @commits