Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #38055 - Fix future-dated subscriptions #11243

Merged
merged 5 commits into from
Dec 4, 2024
Merged

Fixes #38055 - Fix future-dated subscriptions #11243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6228017
Fixes #38055 - Send active=include for Product.all
jeremylenz Dec 2, 2024
50b9ffe
Refs #38055 - Send add_future when getting upstream pools
jeremylenz Dec 2, 2024
8e2423d
Refs #38055 - fix VCRs I hope
jeremylenz Dec 3, 2024
4545dd4
Refs #38055 - Update app/lib/katello/resources/candlepin/product.rb
jeremylenz Dec 4, 2024
d2a19f6
Quinn VCR recording
qcjames53 Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/lib/katello/resources/candlepin/product.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ module Candlepin
class Product < CandlepinResource
class << self
def all(owner_label, included = [])
products = JSON.parse(Candlepin::CandlepinResource.get(path(owner_label) + "?#{included_list(included)}", self.default_headers).body)
url = path(owner_label) + "?active=include" + "&#{included_list(included)}"
products = JSON.parse(Candlepin::CandlepinResource.get(url, self.default_headers).body)
::Katello::Util::Data.array_with_indifferent_access products
end

Expand Down
1 change: 1 addition & 0 deletions app/models/katello/upstream_pool.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def base_params(params)
params[:consumer] = upstream_consumer_id if attachable
params[:sort_by] = 'Product.name'
params[:order] = 'asc'
params[:add_future] = true
params
end

Expand Down
38 changes: 19 additions & 19 deletions test/fixtures/vcr_cassettes/scenarios/import_manifest_manifest_small_modified_zip.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 19 additions & 19 deletions test/fixtures/vcr_cassettes/scenarios/import_manifest_manifest_small_zip.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading