diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-21 01:43:44 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-21 01:43:44 +0300 |
commit | 80f46fe03955014308e46c7d70e46f4787ace88f (patch) | |
tree | 34e73b1463048bd22a48b11572e4a74f1225bf58 /app/assets | |
parent | c087ce1620a6f7958253b4d1074921002ab8f8d7 (diff) | |
parent | 51f07069071673332703e8778a7d3a52041558d4 (diff) |
Merge branch '29559-issue-count' into 'master'
handle commas in Issue total count
Closes #29559
See merge request !10028
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/issue.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js index ef4029a8623..47e675f537e 100644 --- a/app/assets/javascripts/issue.js +++ b/app/assets/javascripts/issue.js @@ -2,6 +2,7 @@ /* global Flash */ require('./flash'); +require('~/lib/utils/text_utility'); require('vendor/jquery.waitforimages'); require('./task_list'); @@ -50,20 +51,21 @@ class Issue { success: function(data, textStatus, jqXHR) { if ('id' in data) { $(document).trigger('issuable:change'); - const currentTotal = Number($('.issue_counter').text()); + let total = Number($('.issue_counter').text().replace(/[^\d]/, '')); if (isClose) { $('a.btn-close').addClass('hidden'); $('a.btn-reopen').removeClass('hidden'); $('div.status-box-closed').removeClass('hidden'); $('div.status-box-open').addClass('hidden'); - $('.issue_counter').text(currentTotal - 1); + total -= 1; } else { $('a.btn-reopen').addClass('hidden'); $('a.btn-close').removeClass('hidden'); $('div.status-box-closed').addClass('hidden'); $('div.status-box-open').removeClass('hidden'); - $('.issue_counter').text(currentTotal + 1); + total += 1; } + $('.issue_counter').text(gl.text.addDelimiter(total)); } else { new Flash(issueFailMessage, 'alert'); } |