deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Issue #263 - dont display ajax loader on commit page if commits < limit

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-11-27 10:36:28 +02:00
parent 814eeb45e6
commit 32ebd438c2
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/commits_controller.rb
View file

@ -12,12 +12,12 @@ class CommitsController < ApplicationController
def index def index
@repo = project.repo @repo = project.repo
limit, offset = (params[:limit] || 20), (params[:offset] || 0) @limit, @offset = (params[:limit] || 20), (params[:offset] || 0)
@commits = if params[:path] @commits = if params[:path]
@repo.log(@ref, params[:path], :max_count => limit, :skip => offset) @repo.log(@ref, params[:path], :max_count => @limit, :skip => @offset)
else else
@repo.commits(@ref, limit, offset) @repo.commits(@ref, @limit, @offset)
end end
respond_to do |format| respond_to do |format|

9
app/views/commits/index.html.haml
View file

@ -20,7 +20,8 @@
.loading{ :style => "display:none;"} .loading{ :style => "display:none;"}
%center= image_tag "ajax-loader.gif" %center= image_tag "ajax-loader.gif"
:javascript - if @commits.count == @limit
$(function(){ :javascript
CommitsList.init("#{@ref}", 20); $(function(){
}); CommitsList.init("#{@ref}", 20);
});