composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-16 22:08:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source
This commit is contained in:
Benjamin Dalsass
2024-02-21 10:50:44 +01:00
parent 623f63abb3 ba0a585256
commit 241f845c08
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/dbobject.class.php
View File

@@ -4730,7 +4730,7 @@ abstract class DBObject implements iDisplay
}
}
$oDate->modify($sModifier);
$this->Set($sAttCode, $oDate->format('Y-m-d H:i:s'));
$this->Set($sAttCode, $oDate->getTimestamp());
}
/**

8
js/components/newsroom-menu.js
View File

@@ -340,11 +340,9 @@ $(function()
this._markOneMessageAsRead(idxProvider, msgId);
// ... and open it as intended
if ($(oElem).attr('target') !== 'undefined') {
window.open($(oElem).attr('href'), $(oElem).attr('target'));
} else {
window.location.href = $(oElem).attr('href');
}
// Note: Default behavior is to open the news on a new tab unless it is specified otherwise
const urlTarget = $(oElem).attr('target') !== 'undefined' ? $(oElem).attr('target') : '_blank';
window.open($(oElem).attr('href'), urlTarget);
// Finally refresh messages
$(this.element).popover_menu("togglePopup");

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

@@ -83,6 +83,7 @@ HTML;
'id' => $oMessage->GetKey(),
'text' => $sText,
'url' => Router::GetInstance()->GenerateUrl(self::ROUTE_NAMESPACE.'.view_event', ['event_id' => $oMessage->GetKey()]),
'target' => '_self',
'start_date' => $oMessage->Get('date'),
'priority' => $oMessage->Get('priority'),
'image' => $sIcon,