rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-02 13:24:20 +01:00
Code Issues Releases Activity

fix events pagniation

Browse Source
This commit is contained in:
Sylvain 2016-06-30 12:41:47 +02:00
parent e36df94f0f
commit 5a0bb86394
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/controllers/events.coffee.erb
View File

@ -36,7 +36,7 @@ Application.Controllers.controller "EventsController", ["$scope", "$state", 'Eve
$scope.loadMoreEvents = -> $scope.loadMoreEvents = ->
Event.query Object.assign({page: $scope.page}, $scope.filters), (data) -> Event.query Object.assign({page: $scope.page}, $scope.filters), (data) ->
$scope.events = $scope.events.concat data $scope.events = $scope.events.concat data
groupEvents(data) groupEvents($scope.events)
$scope.page += 1 $scope.page += 1
if (!data[0] || data[0].nb_total_events <= $scope.events.length) if (!data[0] || data[0].nb_total_events <= $scope.events.length)

2
app/views/api/events/index.json.jbuilder
View File

@ -1,4 +1,4 @@
total = @events.count total = @events.except(:offset, :limit, :order).count
json.cache! [@events, @page] do json.cache! [@events, @page] do
json.array!(@events) do |event| json.array!(@events) do |event|