composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-20 07:42:17 +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:
Molkobain
2024-02-07 15:05:19 +01:00
parent 5b01ad23c4 3e0ca6a70a
commit 400ed9e999
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
css/setup.css
View File

File diff suppressed because one or more lines are too long

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

@@ -126,6 +126,21 @@ $(function()
jsonp: "callback" jsonp: "callback"
}) })
.done(function(oJSONData) { .done(function(oJSONData) {
oJSONData = [{
"id": 31,
"image": "https:\/\/www.itophub.io\/bundles\/combodonotifications\/images\/messages-default-images.svg",
"url": "https:\/\/www.itophub.io\/api\/messages\/messages\/redirect\/30?uuid%5Bbdd%5D=1C4F5832-F6F8-B5C1-8728-BF599B001826&uuid%5Bfile%5D=3AD70B4D-54F8-3556-EBA3-0DC66E53BD4D&uuid%5Buser%5D=1",
"start_date": "2020-12-17T15:39:00+00:00",
"priority": 1,
"text": "Discover the \"Time Tracking\" extension for iTop.\r\n\r\nMake it [clear](https://www.google.com) and easy to track the time spent."
}, {
"id": 51,
"image": "https:\/\/www.itophub.io\/bundles\/combodonotifications\/images\/messages-default-images.svg",
"url": "https:\/\/www.itophub.io\/api\/messages\/messages\/redirect\/50?uuid%5Bbdd%5D=1C4F5832-F6F8-B5C1-8728-BF599B001826&uuid%5Bfile%5D=3AD70B4D-54F8-3556-EBA3-0DC66E53BD4D&uuid%5Buser%5D=1",
"start_date": "2024-01-03T10:43:00+00:00",
"priority": 3,
"text": "Happy New Year to our community!\r\niTop 3.1.1-1 is now out!\r\n\r\nThis maintenance version includes bug and security fixes described in the changelog, as well as improvements to:\r\n* Bring new possibilities for controlling link edition in iTop console\r\n* Enable the creation of calculated fields and integrity checks that take into account the evolution of links between objects.\r\n* Improve search indexing on Enum, Date and Tagset values\r\n* Support localization in portal tooltips\r\n* Improve printing of portal object page and portal dashboard page\r\n\r\nEnjoy!"
}];
me._cacheData(idx, oJSONData); me._cacheData(idx, oJSONData);
me._onMessagesFetched(idx, oJSONData); me._onMessagesFetched(idx, oJSONData);
}).error(function() { }).error(function() {
@@ -334,11 +349,19 @@ $(function()
return; return;
} }
// Otherwise we open the message as intended // Otherwise we mark the message as read...
var idxProvider = $(oElem).attr('data-provider-id'); var idxProvider = $(oElem).attr('data-provider-id');
var msgId = $(oElem).attr('data-msg-id'); var msgId = $(oElem).attr('data-msg-id');
this._markOneMessageAsRead(idxProvider, msgId); 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');
}
// Finally refresh messages
$(this.element).popover_menu("togglePopup"); $(this.element).popover_menu("togglePopup");
this._getAllMessages(); this._getAllMessages();
}, },