From 8c0aba9458a25266bb52bbc2101a83ed05967722 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 1 Apr 2016 12:55:45 -0500
Subject: [PATCH] Get pagination options form the view

---
 app/assets/javascripts/todos.js.coffee        | 27 ++++++++++++-------
 app/controllers/dashboard/todos_controller.rb |  1 -
 app/views/dashboard/todos/index.html.haml     |  1 +
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/todos.js.coffee b/app/assets/javascripts/todos.js.coffee
index ce44a16e224..f39184777ac 100644
--- a/app/assets/javascripts/todos.js.coffee
+++ b/app/assets/javascripts/todos.js.coffee
@@ -1,6 +1,11 @@
 class @Todos
-  constructor: (@name) ->
-    @todos_per_page = gon.todos_per_page || 20
+  constructor: (opts = {}) ->
+    {
+      @el = $('.js-todos-options')
+    } = opts
+
+    @perPage = @el.data('perPage')
+
     @clearListeners()
     @initBtnListeners()
 
@@ -59,26 +64,30 @@ class @Todos
     $('.todos-pending .badge, .todos-pending-count').text data.count
     $('.todos-done .badge').text data.done_count
 
-  getRenderedPages: ->
-    $('.gl-pagination .page').length
+  getTotalPages: ->
+    @el.data('totalPages')
 
   getCurrentPage: ->
-    parseInt($.trim($('.gl-pagination .page.active').text()))
+    @el.data('currentPage')
+
+  getTodosPerPage: ->
+    @el.data('perPage')
+
 
   redirectIfNeeded: (total) ->
-    currPages = @getRenderedPages()
+    currPages = @getTotalPages()
     currPage = @getCurrentPage()
 
-    newPages = Math.ceil(total / @todos_per_page)
+    newPages = Math.ceil(total / @getTodosPerPage())
     url = location.href # Includes query strings
 
     # Refresh if no remaining Todos
-    if !total
+    if not total
       location.reload()
       return
 
     # Do nothing if no pagination
-    return if !currPages
+    return if not currPages
 
     # If new total of pages is different than we have now
     if newPages isnt currPages
diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb
index d91311aa51a..5abf97342c3 100644
--- a/app/controllers/dashboard/todos_controller.rb
+++ b/app/controllers/dashboard/todos_controller.rb
@@ -2,7 +2,6 @@ class Dashboard::TodosController < Dashboard::ApplicationController
   before_action :find_todos, only: [:index, :destroy, :destroy_all]
 
   def index
-    gon.todos_per_page = Todo.default_per_page
     @todos = @todos.page(params[:page])
   end
 
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index f9ec3a89158..49ab8aad1d5 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -45,6 +45,7 @@
 
 .prepend-top-default
   - if @todos.any?
+    .js-todos-options{ data: {per_page: @todos.limit_value, current_page: @todos.current_page, total_pages: @todos.total_pages} }
     - @todos.group_by(&:project).each do |group|
       .panel.panel-default.panel-small.js-todos-list
         - project = group[0]