From 32ebd438c20269004b0d0a50751a955c8aa586f8 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Date: Sun, 27 Nov 2011 10:36:28 +0200
Subject: [PATCH] Issue #263 - dont display ajax loader on commit page if
commits < limit
---
app/controllers/commits_controller.rb | 6 +++---
app/views/commits/index.html.haml | 9 +++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb
index 7ca5e3bf7ca..376527394ca 100644
--- a/app/controllers/commits_controller.rb
+++ b/app/controllers/commits_controller.rb
@@ -12,12 +12,12 @@ class CommitsController < ApplicationController
def index
@repo = project.repo
- limit, offset = (params[:limit] || 20), (params[:offset] || 0)
+ @limit, @offset = (params[:limit] || 20), (params[:offset] || 0)
@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
- @repo.commits(@ref, limit, offset)
+ @repo.commits(@ref, @limit, @offset)
end
respond_to do |format|
diff --git a/app/views/commits/index.html.haml b/app/views/commits/index.html.haml
index 14317b4cb28..fb8d039052b 100644
--- a/app/views/commits/index.html.haml
+++ b/app/views/commits/index.html.haml
@@ -20,7 +20,8 @@
.loading{ :style => "display:none;"}
%center= image_tag "ajax-loader.gif"
-:javascript
- $(function(){
- CommitsList.init("#{@ref}", 20);
- });
+- if @commits.count == @limit
+ :javascript
+ $(function(){
+ CommitsList.init("#{@ref}", 20);
+ });
--
GitLab