composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.2' into develop

Browse Source 
# Conflicts:
#	tests/php-unit-tests/src/Hook/TestsRunStartHook.php
This commit is contained in:
Romain Quetiez
2024-05-16 20:24:38 +02:00
parent 62a7850a0b 365d948a59
commit 68ee3231f4
2080 changed files with 2941 additions and 2935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/Controller/AbstractAppController.php
View File

@@ -1,6 +1,6 @@
<?php
/**
* Copyright (C) 2013-2023 Combodo SARL
* Copyright (C) 2013-2024 Combodo SAS
*
* This file is part of iTop.
*

2
sources/Controller/AbstractController.php
View File

@@ -1,6 +1,6 @@
<?php
/*
* @copyright Copyright (C) 2010-2023 Combodo SARL
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license http://opensource.org/licenses/AGPL-3.0
*/

2
sources/Controller/AjaxRenderController.php
View File

@@ -1,6 +1,6 @@
<?php
/*
* @copyright Copyright (C) 2010-2023 Combodo SARL
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license http://opensource.org/licenses/AGPL-3.0
*/

2
sources/Controller/Base/Layout/ActivityPanelController.php
View File

@@ -1,6 +1,6 @@
<?php
/*
* @copyright Copyright (C) 2010-2023 Combodo SARL
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license http://opensource.org/licenses/AGPL-3.0
*/

2
sources/Controller/Base/Layout/ObjectController.php
View File

@@ -1,6 +1,6 @@
<?php
/*
* @copyright Copyright (C) 2010-2023 Combodo SARL
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license http://opensource.org/licenses/AGPL-3.0
*/

2
sources/Controller/Links/LinkSetController.php
View File

@@ -1,6 +1,6 @@
<?php
/*
* @copyright Copyright (C) 2010-2023 Combodo SARL
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license http://opensource.org/licenses/AGPL-3.0
*/

10
sources/Controller/Newsroom/iTopNewsroomController.php
View File

@@ -358,7 +358,7 @@ JS
$oPage->AddUiBlock($oBulkActionsBlock);
// Search for all notifications for the current user
$oSearch = DBObjectSearch::FromOQL('SELECT EventiTopNotification');
$oSearch = DBObjectSearch::FromOQL('SELECT EventNotificationNewsroom');
$oSearch->AddCondition('contact_id', UserRights::GetContactId(), '=');
$oSet = new DBObjectSet($oSearch, array('read' => true, 'date' => false), array());
@@ -528,7 +528,7 @@ JS
$iContactId = UserRights::GetContactId();
if (utils::IsNotNullOrEmptyString($iContactId)) {
$oSearch = DBObjectSearch::FromOQL('SELECT EventiTopNotification WHERE contact_id = :contact_id AND read = "no"');
$oSearch = DBObjectSearch::FromOQL('SELECT EventNotificationNewsroom WHERE contact_id = :contact_id AND read = "no"');
$oSet = new DBObjectSet($oSearch, array(), array('contact_id' => $iContactId));
while ($oMessage = $oSet->Fetch()) {
@@ -542,7 +542,7 @@ $sMessage
HTML;
$sIcon = $oMessage->Get('icon') !== null ?
$oMessage->Get('icon')->GetDisplayURL('EventiTopNotification', $oMessage->GetKey(), 'icon') :
$oMessage->Get('icon')->GetDisplayURL('EventNotificationNewsroom', $oMessage->GetKey(), 'icon') :
Branding::GetCompactMainLogoAbsoluteUrl();
$aMessages[] = array(
'id' => $oMessage->GetKey(),
@@ -579,7 +579,7 @@ HTML;
if (utils::IsNotNullOrEmptyString($iContactId)) {
$oSearch = DBObjectSearch::FromOQL('SELECT EventiTopNotification WHERE contact_id = :contact_id AND read = "no"');
$oSearch = DBObjectSearch::FromOQL('SELECT EventNotificationNewsroom WHERE contact_id = :contact_id AND read = "no"');
$oSet = new DBObjectSet($oSearch, array(), array('contact_id' => $iContactId));
while ($oEvent = $oSet->Fetch()) {
@@ -609,7 +609,7 @@ HTML;
$sEventId = utils::ReadParam('event_id', 0);
if ($sEventId > 0) {
try {
$oEvent = MetaModel::GetObject('EventiTopNotification', $sEventId);
$oEvent = MetaModel::GetObject('EventNotificationNewsroom', $sEventId);
if ($oEvent !== null && $oEvent->Get('contact_id') === UserRights::GetContactId()) {
$oEvent->Set('read', 'yes');
$oEvent->SetCurrentDate('read_date');

2
sources/Controller/PreferencesController.php
View File

@@ -1,6 +1,6 @@
<?php
/*
* @copyright Copyright (C) 2010-2023 Combodo SARL
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license http://opensource.org/licenses/AGPL-3.0
*/

2
sources/Controller/TemporaryObjects/TemporaryObjectController.php
View File

@@ -1,6 +1,6 @@
<?php
/*
* @copyright Copyright (C) 2010-2023 Combodo SARL
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license http://opensource.org/licenses/AGPL-3.0
*/

2
sources/Controller/iController.php
View File

@@ -1,6 +1,6 @@
<?php
/*
* @copyright Copyright (C) 2010-2023 Combodo SARL
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license http://opensource.org/licenses/AGPL-3.0
*/