Merge branch 'master' of abf.rosalinux.ru:abf/rosa-build

app/assets/javascripts/angularjs/controllers/git_tree_controller.js

@@ -13,12 +13,14 @@ RosaABF.controller('GitTreeCtrl', ['$scope', '$http', '$location', function($sco
   };
 
   $scope.refresh = function(more) {
-    $scope.processing = true;
-
     var params = { format: 'json', path: $scope.path };
 
     if(more) {
       params.page      = $scope.next_page;
+      $scope.load_more = true;
+    }
+    else {
+      $scope.processing = true;
     }
 
     $http.get(Routes.tree_path($scope.project, $scope.treeish, params)).then(function(res) {
@@ -28,11 +30,12 @@ RosaABF.controller('GitTreeCtrl', ['$scope', '$http', '$location', function($sco
       $scope.next_page  = res.data.next_page;
       if(more) {
         $scope.tree.push.apply($scope.tree, res.data.tree);
+        $scope.load_more = false;
       }
       else {
         $scope.tree       = res.data.tree;
-      }
         $scope.processing = false;
+      }
     });
   };
 

app/views/projects/git/trees/_show.html.haml

@@ -59,6 +59,6 @@
         %td{ 'ng-hide' => 'el.commit' }
 
   %hr
-  %btn.center-block.btn.btn-primary{ 'ng-show' => 'next_page', 'ng-disabled' => 'processing',
+  %btn.center-block.btn.btn-primary{ 'ng-show' => 'next_page', 'ng-disabled' => 'load_more || processing',
                                      'ng-click' => 'getTree($event, null, true)' }
     = t 'layout.activity_feed.load_more'

app/views/projects/git/trees/show.json.jbuilder

@@ -64,6 +64,5 @@ else
 
   json.path @path
   json.root_path @path.present? ? @path.split('/')[0...-1].join('/') : nil
-  params[:page].to_i
   json.next_page page.next if @tree && @tree.contents.count >= Project::CONTENT_LIMIT*(page+1)
 end