From 2e97b3b5936a708b1234da2dc80f7edde76fdfc9 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Thu, 22 Oct 2020 16:11:58 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B02847=20-=20Add=20reminders=20/=20info=20?= =?UTF-8?q?message=20for=20refactoring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2.x/itop-portal-base/portal/templates/layout.html.twig | 5 +++++ js/utils.js | 2 ++ 2 files changed, 7 insertions(+) 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 bbe3e25bf..34ba1a8eb 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 @@ -421,12 +421,14 @@ return '{{ app['url_generator'].generate('p_session_message_add')|raw }}'; }; // Helper to add a parameter to an url + // TODO 3.0.0: Move to CombodoGlobalToolbox and deprecate this one 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) { try { @@ -436,10 +438,12 @@ } return true; }; + // TODO 3.0.0: Move to CombodoPortalToolbox and deprecate this one var GetContentLoaderTemplate = function() { return '
{{ 'Page:PleaseWait'|dict_s }}
'; }; + // TODO 3.0.0: Move to CombodoPortalToolbox and deprecate this one var ShowLoginDialog = function() { var oModalElem = $('#modal-for-alert').clone(); @@ -452,6 +456,7 @@ oModalElem.appendTo('body'); oModalElem.modal('show'); }; + // TODO 3.0.0: Move to CombodoPortalToolbox and deprecate this one var ShowErrorDialog = function(sBody, sTitle) { if(sTitle === undefined) diff --git a/js/utils.js b/js/utils.js index e7ca41882..4e91adb07 100644 --- a/js/utils.js +++ b/js/utils.js @@ -798,6 +798,8 @@ Dict.Format = function () { return Format(args); } +// TODO 3.0.0: Move functions above either in CombodoGlobalToolbox or CombodoBackofficeToolbox and deprecate them + /** * A toolbox for common JS operations accross the app no matter the GUI. Meant to be used by Combodo developers and the community. *