Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
6970f42e
Commit
6970f42e
authored
Feb 16, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renders pagination again for pipelines table
parent
0aaf22de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+4
-1
app/assets/javascripts/vue_pipelines_index/store.js.es6
app/assets/javascripts/vue_pipelines_index/store.js.es6
+1
-1
No files found.
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
View file @
6970f42e
...
@@ -50,10 +50,13 @@ const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_s
...
@@ -50,10 +50,13 @@ const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_s
*
*
* If no scope is provided, 'all' is assumed.
* If no scope is provided, 'all' is assumed.
*
*
* Pagination component sends "null" when no scope is provided.
*
* @param {Number} pagenum
* @param {Number} pagenum
* @param {String} apiScope = 'all'
* @param {String} apiScope = 'all'
*/
*/
change(pagenum, apiScope = 'all') {
change(pagenum, apiScope) {
if (!apiScope) apiScope = 'all';
gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`);
gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`);
},
},
},
},
...
...
app/assets/javascripts/vue_pipelines_index/store.js.es6
View file @
6970f42e
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
((gl) => {
((gl) => {
const pageValues = (headers) => {
const pageValues = (headers) => {
const normalized = gl.utils.normalizeHeaders(headers);
const normalized = gl.utils.normalizeHeaders(headers);
const paginationInfo = gl.utils.
normalizeHeaders
(normalized);
const paginationInfo = gl.utils.
parseIntPagination
(normalized);
return paginationInfo;
return paginationInfo;
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment