kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-pipelines-pagination-is-gone' into 'master' 

Renders pagination again for pipelines table

Closes #28299

See merge request !9315
This commit is contained in:
Alfredo Sumaran 2017-02-16 19:50:58 +00:00
parent d6fea1e8be 6970f42e28
commit b632bdddee
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
View File

@ -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}`);
},
},

2
app/assets/javascripts/vue_pipelines_index/store.js.es6
View File

@ -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;
};