summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2016-11-11 22:50:56 +0000
committerLuke "Jared" Bennett <lbennett@gitlab.com>2016-11-11 22:50:56 +0000
commit0fe01616ca700dce535054f35c3487b5a9317360 (patch)
tree52fd708b4c7a9e36580f74f7baf301af42318e87
parent6eeff67c6e03233d4480a55d05d4e0f1a88aef4c (diff)
downloadgitlab-ce-20013-pagination-limits-autocomplete-results-for-group-links.tar.gz
-rw-r--r--app/assets/javascripts/api.js3
-rw-r--r--app/assets/javascripts/groups_select.js6
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js
index 1cab66e109e..5805d0aef64 100644
--- a/app/assets/javascripts/api.js
+++ b/app/assets/javascripts/api.js
@@ -23,12 +23,13 @@
},
// Return groups list. Filtered by query
groups: function(query, options, callback) {
+ options.per_page = options.per_page || 20;
var url = Api.buildUrl(Api.groupsPath);
return $.ajax({
url: url,
data: $.extend({
search: query,
- per_page: 20
+ per_page: options.per_page
}, options),
dataType: "json"
}).done(function(groups) {
diff --git a/app/assets/javascripts/groups_select.js b/app/assets/javascripts/groups_select.js
index e3c39c895ba..7d5a7c41089 100644
--- a/app/assets/javascripts/groups_select.js
+++ b/app/assets/javascripts/groups_select.js
@@ -14,7 +14,11 @@
multiple: $(select).hasClass('multiselect'),
minimumInputLength: 0,
query: function(query) {
- options = { all_available: all_available, skip_groups: skip_groups };
+ options = {
+ all_available: all_available,
+ skip_groups: skip_groups,
+ per_page: 100
+ };
return Api.groups(query.term, options, function(groups) {
var data;
data = {