Merge pull request #4662 from tvdeyen/paginate-variant-autocomplete-v3.2

[v3.2] Paginate variant autocomplete
solidusio · Oct 7, 2022 · a88815b · a88815b
2 parents 3d578f8 + 19d2a71
commit a88815b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/backend/app/assets/javascripts/spree/backend/variant_autocomplete.js b/backend/app/assets/javascripts/spree/backend/variant_autocomplete.js
@@ -32,15 +32,17 @@
  data: function(term, page) {
  var searchData = {
  variant_search_term: term,
- token: Spree.api_key
+ token: Spree.api_key,
+ page: page
  };
  return _.extend(searchData, searchOptions);
  },
 
  results: function(data, page) {
  window.variants = data["variants"];
  return {
- results: data["variants"]
+ results: data["variants"],
+ more: data.current_page * data.per_page < data.total_count
  };
  }
  },

diff --git a/backend/vendor/assets/stylesheets/solidus_admin/select2.scss b/backend/vendor/assets/stylesheets/solidus_admin/select2.scss
@@ -439,7 +439,7 @@ disabled look for disabled choices in the results dropdown
 }
 
 .select2-more-results.select2-active {
- background: #f4f4f4 image-url('solidus_admin/select2-spinner.gif') no-repeat 100%;
+ background: #f4f4f4 image-url('solidus_admin/select2-spinner.gif') no-repeat 95% center;
 }
 
 .select2-results .select2-ajax-error {
@@ -449,6 +449,7 @@ disabled look for disabled choices in the results dropdown
 .select2-more-results {
  background: #f4f4f4;
  display: list-item;
+ padding: 0.5em 1em
 }
 
 /* disabled styles */