From cb7dea7cf6f354fade8a3fea03c7ea18ce8ac95c Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Tue, 24 Mar 2020 20:31:10 +0000 Subject: [PATCH] /api/product_info - fix missing support_website, support_website_text The i18n.t version was removed in https://github.com/ManageIQ/manageiq/pull/19881, in favor of using Settings in https://github.com/ManageIQ/manageiq-ui-classic/pull/6718. But the API is still using it, updating to do the same thing. (The SUI is using this for a menu item.) --- app/controllers/api/api_controller.rb | 4 ++-- spec/requests/entrypoint_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/api_controller.rb b/app/controllers/api/api_controller.rb index 8fd3c430d1..4860cde920 100644 --- a/app/controllers/api/api_controller.rb +++ b/app/controllers/api/api_controller.rb @@ -80,8 +80,8 @@ def product_info_data :name => Vmdb::Appliance.PRODUCT_NAME, :name_full => I18n.t("product.name_full"), :copyright => I18n.t("product.copyright"), - :support_website => I18n.t("product.support_website"), - :support_website_text => I18n.t("product.support_website_text"), + :support_website => ::Settings.docs.product_support_website, + :support_website_text => ::Settings.docs.product_support_website_text, :branding_info => branding_info } end diff --git a/spec/requests/entrypoint_spec.rb b/spec/requests/entrypoint_spec.rb index abf0b8877a..fe07f5a81b 100644 --- a/spec/requests/entrypoint_spec.rb +++ b/spec/requests/entrypoint_spec.rb @@ -69,8 +69,8 @@ "name" => Vmdb::Appliance.PRODUCT_NAME, "name_full" => I18n.t("product.name_full"), "copyright" => I18n.t("product.copyright"), - "support_website" => I18n.t("product.support_website"), - "support_website_text" => I18n.t("product.support_website_text") + "support_website" => ::Settings.docs.product_support_website, + "support_website_text" => ::Settings.docs.product_support_website_text ) )