diff options
author | Phil Hughes <me@iamphill.com> | 2018-01-26 15:04:44 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-01-29 09:06:58 +0000 |
commit | cf4fb53f560721ff6c5713886132d6678a62673d (patch) | |
tree | 2a4c99b3d53f33727d2e011af92502d0db38d99a /app/assets/javascripts/groups | |
parent | c49fecdea5c3e638986be6f683f169bcaa2f973b (diff) | |
download | gitlab-ce-cf4fb53f560721ff6c5713886132d6678a62673d.tar.gz |
normalize headers correctly
i18n flash message
Diffstat (limited to 'app/assets/javascripts/groups')
-rw-r--r-- | app/assets/javascripts/groups/groups_filterable_list.js | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/app/assets/javascripts/groups/groups_filterable_list.js b/app/assets/javascripts/groups/groups_filterable_list.js index 3f65853508e..31d56d15c23 100644 --- a/app/assets/javascripts/groups/groups_filterable_list.js +++ b/app/assets/javascripts/groups/groups_filterable_list.js @@ -1,6 +1,6 @@ import FilterableList from '~/filterable_list'; import eventHub from './event_hub'; -import { getParameterByName } from '../lib/utils/common_utils'; +import { normalizeHeaders, getParameterByName } from '../lib/utils/common_utils'; export default class GroupFilterableList extends FilterableList { constructor({ form, filter, holder, filterEndpoint, pagePath, dropdownSel, filterInputField }) { @@ -97,20 +97,11 @@ export default class GroupFilterableList extends FilterableList { onFilterSuccess(res, queryData) { const currentPath = this.getPagePath(queryData); - const paginationData = { - 'X-Per-Page': res.headers['x-per-page'], - 'X-Page': res.headers['x-page'], - 'X-Total': res.headers['x-total'], - 'X-Total-Pages': res.headers['x-total-pages'], - 'X-Next-Page': res.headers['x-next-page'], - 'X-Prev-Page': res.headers['x-prev-page'], - }; - window.history.replaceState({ page: currentPath, }, document.title, currentPath); eventHub.$emit('updateGroups', res.data, Object.prototype.hasOwnProperty.call(queryData, this.filterInputField)); - eventHub.$emit('updatePagination', paginationData); + eventHub.$emit('updatePagination', normalizeHeaders(res.headers)); } } |