jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修复版本库查看单个文件500问题

This commit is contained in:
huang 2017-01-12 10:25:13 +08:00
parent 6aa2052c7f
commit 0bd5cd52d7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/repositories_controller.rb
View File

@ -498,7 +498,8 @@ update
entry_and_raw(false) entry_and_raw(false)
@content = @repository.cat(@path, @rev) @content = @repository.cat(@path, @rev)
@changesets_latest_coimmit = @g.commit(@project.gpid, @entry.try(:lastrev)) # @changesets_latest_coimmit = @g.commit(@project.gpid, @entry.try(:lastrev))
@changesets_latest_coimmit = @g.rep_last_changes(@project.gpid, :rev => @rev, :path => @path)
# 总的提交数 # 总的提交数
@changesets_all_count = @g.user_static(@project.gpid, :rev => @rev).count @changesets_all_count = @g.user_static(@project.gpid, :rev => @rev).count
if is_entry_text_data?(@content, @path) if is_entry_text_data?(@content, @path)

2
app/views/repositories/show.html.erb
View File

@ -31,7 +31,7 @@
:creator => @creator, :default_branch => @g_default_branch ) %> :creator => @creator, :default_branch => @g_default_branch ) %>
</li> </li>
</ul> </ul>
<div class=" clearfix mb10"> <div class=" clearfix mb5">
<div class=" fl clearfix"> <div class=" fl clearfix">
<%= render :partial => 'navigation' %> <%= render :partial => 'navigation' %>
</div> </div>