composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +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:
Pierre Goiffon
2024-02-28 16:44:29 +01:00
parent 3b27e6e466 76167a3d54
commit 6224f8ca51
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/jquery-ui-1.11.4.custom.min.js vendored
View File

@@ -1,4 +1,6 @@
//@deperecated since 3.0 use jquery-ui.custom.min.js
/**
* @deprecated since 3.0 use jquery-ui.custom.min.js
*/
/*! jQuery UI - v1.11.4 - 2018-02-20
* http://jqueryui.com

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

@@ -363,7 +363,7 @@ JS
// Search for all notifications for the current user
$oSearch = DBObjectSearch::FromOQL('SELECT EventiTopNotification');
$oSearch->AddCondition('contact_id', UserRights::GetContactId(), '=');
$oSet = new DBObjectSet($oSearch, array('read' => true, 'date' => true), array());
$oSet = new DBObjectSet($oSearch, array('read' => true, 'date' => false), array());
// Add main content block
$oMainContentBlock = new UIContentBlock(null, ['ibo-notifications--view-all--container']);