From 2892949e33b0cdc7af313d06f82802cf2baf9433 Mon Sep 17 00:00:00 2001 From: Benjamin Dalsass <95754414+bdalsass@users.noreply.github.com> Date: Fri, 14 Aug 2026 09:14:51 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B08726=20-=20Portal=20deprecated=20removal?= =?UTF-8?q?=20(#990)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/public/js/toolbox.js | 24 +------------------ .../src/Helper/ObjectFormHandlerHelper.php | 3 --- .../portal/templates/layout.html.twig | 12 ---------- 3 files changed, 1 insertion(+), 38 deletions(-) diff --git a/datamodels/2.x/itop-portal-base/portal/public/js/toolbox.js b/datamodels/2.x/itop-portal-base/portal/public/js/toolbox.js index d0a5a3f98..d8a635e30 100644 --- a/datamodels/2.x/itop-portal-base/portal/public/js/toolbox.js +++ b/datamodels/2.x/itop-portal-base/portal/public/js/toolbox.js @@ -22,29 +22,7 @@ * @since 2.7.0 */ const CombodoPortalToolbox = { - /** - * Close all opened modals on the page - * @deprecated 3.1.0 Use CombodoModal.CloseAllModals() instead - */ - CloseAllModals: function() { - CombodoModal.CloseAllModals(); - }, - /** - * @deprecated 3.1.0 Use CombodoModal.OpenUrlInModal() instead - */ - OpenUrlInModal: function(sTargetUrl, bCloseOtherModals) { - CombodoModal.OpenUrlInModal(sTargetUrl, bCloseOtherModals); - }, - /** - * @deprecated 3.1.0 Use CombodoModal.OpenModal() instead - */ - OpenModal: function(oOptions) { - // Default value fallback for calls prior to 3.1.0 - if (oOptions.size === undefined) { - oOptions.size = 'lg'; - } - return CombodoModal.OpenModal(oOptions); - }, + /** * Generic function to call a specific endpoint with callbacks * diff --git a/datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php b/datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php index 003d5b8a9..4f0aae96a 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php @@ -216,9 +216,6 @@ class ObjectFormHandlerHelper $aNavigationRules = $this->oNavigationRuleHelper->PrepareRulesForForm($aFormProperties, $oObject, $bModal); $aFormData['submit_rule'] = $aNavigationRules['submit']; $aFormData['cancel_rule'] = $aNavigationRules['cancel']; - /** @deprecated We keep the "xxx_callback" name to keep compatibility with extensions using the portal_form_handler.js widget but they will be removed in a future version. */ - $aFormData['submit_callback'] = $aNavigationRules['submit']['url']; - $aFormData['cancel_callback'] = $aNavigationRules['cancel']['url']; // Preparing renderer // Note : We might need to distinguish form & renderer endpoints diff --git a/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig index 6fa5351c3..fa3324166 100644 --- a/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig @@ -286,18 +286,6 @@ }; // user preferences object const oUserPreferences = new UserPreferences('{{ app['url_generator'].generate('p_preferences_set_preference')|raw }}'); - /** - * @param sUrl {string} The URL to append the new param to - * @param sParamName {string} Name of the parameter - * @param sParamValue {string} Value of the param, needs to be already URL encoded - * @return {string} The sUrl parameters with the sParamName / sParamValue append at the right place - * @deprecated 3.0.0 N°4176 - */ - var AddParameterToUrl = function(sUrl, sParamName, sParamValue) - { - sUrl += (sUrl.split('?')[1] ? '&':'?') + sParamName + '=' + sParamValue; - return sUrl; - }; // Test is sString is a valid JSON string // TODO 3.0.0: Move to CombodoGlobalToolbox and deprecate this one var IsJSONString = function(sString)