From e0f354dd704f556439932aa897cfefd48259ede7 Mon Sep 17 00:00:00 2001 From: Jeremy Lenz Date: Tue, 17 Sep 2024 17:27:41 -0400 Subject: [PATCH] Fixes #37832 - Don't use cached manifest expiration date after manifest refresh --- app/controllers/katello/api/v2/organizations_controller.rb | 1 + webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/katello/api/v2/organizations_controller.rb b/app/controllers/katello/api/v2/organizations_controller.rb index 9d2ed9def5f..72db519e884 100644 --- a/app/controllers/katello/api/v2/organizations_controller.rb +++ b/app/controllers/katello/api/v2/organizations_controller.rb @@ -50,6 +50,7 @@ def index param :id, :number, :desc => N_("organization ID"), :required => true def show @render_template = 'katello/api/v2/organizations/show' + @organization.manifest_expiration_date(cached: false) if params[:force_manifest_expire_cache] super end diff --git a/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js b/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js index e47840efb2e..05bed5e9be4 100644 --- a/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js +++ b/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js @@ -32,7 +32,7 @@ class ManageManifestModal extends Component { } if (prevProps.taskInProgress && !this.props.taskInProgress) { - this.props.loadOrganization(); + this.props.loadOrganization({ force_manifest_expire_cache: true }); this.props.loadManifestHistory(); }