From 5fee2438ab1c33d69cf2c38757caa2f3ebd9c5e7 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Wed, 14 Oct 2020 09:06:07 +0200 Subject: [PATCH] Fix comments : iTop 2.8.0 renamed to 3.0.0 --- .../src/controllers/userprofilebrickcontroller.class.inc.php | 2 +- .../portal/src/helpers/applicationhelper.class.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php index 16707297d..3deb6d294 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php @@ -331,7 +331,7 @@ class UserProfileBrickController extends BrickController $aFormData['error'] = $e->GetMessage(); } - // TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 2.8 + // TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 3.0 $aFormData['picture_url'] = $oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($oCurContact), 'sObjectId' => $oCurContact->GetKey(), 'sObjectField' => $sPictureAttCode, 'cache' => 86400, 't' => time())); $aFormData['validation'] = array( 'valid' => true, diff --git a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php index 04abf66db..8f7a89763 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php @@ -650,7 +650,7 @@ class ApplicationHelper { // Note: At this stage of runtime, the UrlGenerator context is not properly initialized (lacks the baseurl among other things). // The Context is set later by the RouterListener during an event, so we manually put the base url with utils::GetAbsoluteUrlExecPage() - // TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 2.8 + // TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 3.0 $sContactPhotoUrl = utils::GetAbsoluteUrlExecPage().$oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($oContact), 'sObjectId' => $oContact->GetKey(), 'sObjectField' => 'picture', 'cache' => 86400)); } else