diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-16 18:10:23 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-16 18:10:23 +0000 |
commit | 6970f42e2892c665657532dc105bd7c17c701c60 (patch) | |
tree | 2bf836d18baba6ca71e003224e5e807d47f38031 /app | |
parent | 0aaf22ded4e98f91a8b34539d9afe3ce20003e4d (diff) | |
download | gitlab-ce-6970f42e2892c665657532dc105bd7c17c701c60.tar.gz |
Renders pagination again for pipelines table
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 | 5 | ||||
-rw-r--r-- | app/assets/javascripts/vue_pipelines_index/store.js.es6 | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 index 02ad029119d..dac364977d5 100644 --- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 @@ -50,10 +50,13 @@ const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_s * * If no scope is provided, 'all' is assumed. * + * Pagination component sends "null" when no scope is provided. + * * @param {Number} pagenum * @param {String} apiScope = 'all' */ - change(pagenum, apiScope = 'all') { + change(pagenum, apiScope) { + if (!apiScope) apiScope = 'all'; gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`); }, }, diff --git a/app/assets/javascripts/vue_pipelines_index/store.js.es6 b/app/assets/javascripts/vue_pipelines_index/store.js.es6 index ffed5f53097..909007267b9 100644 --- a/app/assets/javascripts/vue_pipelines_index/store.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/store.js.es6 @@ -4,7 +4,7 @@ ((gl) => { const pageValues = (headers) => { const normalized = gl.utils.normalizeHeaders(headers); - const paginationInfo = gl.utils.normalizeHeaders(normalized); + const paginationInfo = gl.utils.parseIntPagination(normalized); return paginationInfo; }; |