diff options
| author | Nur Rony <pro.nmrony@gmail.com> | 2017-02-22 13:19:09 +0600 |
|---|---|---|
| committer | Nur Rony <pro.nmrony@gmail.com> | 2017-02-22 13:19:09 +0600 |
| commit | 72804fe23bf20fee11f2459679809e6376516879 (patch) | |
| tree | 0020722b7297c06f4b49a691189460e26bcaed6a | |
| parent | 5a84b5fd7c5e281de7fad55a308ff35da64f50ca (diff) | |
| download | gitlab-ce-28462-fix-delimiter-removes-issue-in-todo-counter.tar.gz | |
fixes delimiter removes when todo marked as done28462-fix-delimiter-removes-issue-in-todo-counter
| -rw-r--r-- | app/assets/javascripts/todos.js.es6 | 1 | ||||
| -rw-r--r-- | app/controllers/dashboard/todos_controller.rb | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/todos.js.es6 b/app/assets/javascripts/todos.js.es6 index e9513725d9d..b946f2b58c0 100644 --- a/app/assets/javascripts/todos.js.es6 +++ b/app/assets/javascripts/todos.js.es6 @@ -69,6 +69,7 @@ '_method': target.getAttribute('data-method'), }, success: (data) => { + console.log('data', data, target.getAttribute('href')); this.updateState(target); this.updateBadges(data); }, diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb index ee2358b986d..5848ca62777 100644 --- a/app/controllers/dashboard/todos_controller.rb +++ b/app/controllers/dashboard/todos_controller.rb @@ -1,4 +1,6 @@ class Dashboard::TodosController < Dashboard::ApplicationController + include ActionView::Helpers::NumberHelper + before_action :find_todos, only: [:index, :destroy_all] def index @@ -48,8 +50,8 @@ class Dashboard::TodosController < Dashboard::ApplicationController def todos_counts { - count: current_user.todos_pending_count, - done_count: current_user.todos_done_count + count: number_with_delimiter(current_user.todos_pending_count), + done_count: number_with_delimiter(current_user.todos_done_count) } end end |