Skip to content

Commit

Permalink
Issue/7707 (#687)
Browse files Browse the repository at this point in the history 
* N°7707 - Newsroom user preference display counter not changeable
  • Loading branch information
@xguiboud
xguiboud authored Nov 28, 2024
1 parent fcfdac2 commit af8ff9b
Show file tree
Hide file tree
Showing 19 changed files with 55 additions and 9 deletions.
6 changes: 6 additions & 0 deletions core/datamodel.core.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,13 @@
} else {
foreach ($aRecipientsIds as $iRecipientId) {
$oEvent = Combodo\iTop\Service\Notification\Event\EventNotificationNewsroomService::MakeEventFromAction($this, $iRecipientId, $oTrigger->GetKey(), $sMessage, $sTitle, $sUrl, $iObjectId, $sObjectClass);
try {
$oEvent->DBInsertNoReload();
} catch(CoreCannotSaveObjectException $e) {
ExceptionLog::LogException($e);
$oEvent = Combodo\iTop\Service\Notification\Event\EventNotificationNewsroomService::MakeEventFromAction($this, $iRecipientId, $oTrigger->GetKey(), Dict::Format('Core:EventNotificationNewsroom:ErrorOnDBInsert'), Dict::Format('Core:EventNotificationNewsroom:ErrorNotificationNotSent'), $sUrl, $iObjectId, $sObjectClass);
$oEvent->DBInsertNoReload();
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/cs.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
'Core:Duration_Seconds' => '%1$ds',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:ExecProcess:Code1' => 'Chybní příkaz, nebo příkaz skončil s chybou (např chybný název skriptu)',
'Core:ExecProcess:Code255' => 'PHP Error (parsing/runtime)',
'Core:ExplainWTC:ElapsedTime' => 'Uplynulý čas ("%1$s")',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/da.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
'Core:Duration_Seconds' => '%1$ds',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:ExecProcess:Code1' => 'Forkert kommando eller kommandoen afsluttede med fejl (f.eks. forkert script navn)',
'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)',
'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as "%1$s")~~',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/de.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
'Core:Duration_Seconds' => '%1$ds',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:ExecProcess:Code1' => 'Falscher Befehl oder Befehl mit Fehler beendet (z.B. falscher Skriptname).',
'Core:ExecProcess:Code255' => 'PHP-Fehler (Parsing oder Laufzeit)',
'Core:ExplainWTC:ElapsedTime' => 'Abgelaufene Zeit (gespeichert als \"%1$s\")',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/en.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,8 @@
'Class:EventNotificationNewsroom/Attribute:read_date+' => '',
'Class:EventNotificationNewsroom/Attribute:contact_id' => 'Contact',
'Class:EventNotificationNewsroom/Attribute:contact_id+' => '',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification',
));

//
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/es_cr.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
'Core:Duration_Seconds' => '%1$ds',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:ExecProcess:Code1' => 'Comando equivocado o comando terminó con errores (ejem. nombre incorrecto de script)',
'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)',
'Core:ExplainWTC:ElapsedTime' => 'Tiempo transcurrido (almacenado como \"%1$s\")',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/fr.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
'Core:Duration_Seconds' => '%1$ds',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification non envoyée',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'Une erreur est survenue lors de l\'envoi de la notification',
'Core:ExecProcess:Code1' => 'Mauvaise commande ou commande se finissant avec des erreurs (e.g. mauvais nom de script)',
'Core:ExecProcess:Code255' => 'Erreur PHP (analyse de fichier, ou exécution)',
'Core:ExplainWTC:ElapsedTime' => 'Temps écoulé (enregistré dans "%1$s")',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/hu.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$d óra %2$d perc %3$d mp',
'Core:Duration_Minutes_Seconds' => '%1$d perc %2$d mp',
'Core:Duration_Seconds' => '%1$d mp',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:ExecProcess:Code1' => 'Helytelen parancs vagy hibásan befejezett parancs (pl. helytelen szkriptnév)',
'Core:ExecProcess:Code255' => 'PHP hiba (parsing, vagy runtime)',
'Core:ExplainWTC:ElapsedTime' => 'Eltelt idő (tárolva mint %1$s)',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/it.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$sec',
'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
'Core:Duration_Seconds' => '%1$ds',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:ExecProcess:Code1' => 'Comando errato o comando finito con errori (es. errato nome dello script)',
'Core:ExecProcess:Code255' => 'Errore PHP (parsing o runtime)',
'Core:ExplainWTC:ElapsedTime' => 'Tempo trascorso (memorizzato come \"%1$s\")',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/ja.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,8 @@
'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for "%1$s"~~',
'Core:FriendlyName-Description' => 'Friendly name',
'Core:FriendlyName-Label' => 'Name',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:Placeholder:CannotBeResolved' => '(%1$s : cannot be resolved)~~',
'Core:SyncDataExchangeComment' => '(データ同期)',
'Core:SyncDataSourceAccessRestriction' => '管理者またはデータ·ソースに指定されたユーザーのみ、この操作を実行することができます。操作はキャンセルされました。',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/nl.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
'Core:Duration_Seconds' => '%1$ds',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:ExecProcess:Code1' => 'Verkeerde commando of commando beëindigd met fouten (bijvoorbeeld verkeerde scriptnaam)',
'Core:ExecProcess:Code255' => 'PHP Error (parsing, of runtime)',
'Core:ExplainWTC:ElapsedTime' => 'Tijd voorbij (opgeslagen als "%1$s")',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/pl.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
'Core:Duration_Seconds' => '%1$ds',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:ExecProcess:Code1' => 'Niewłaściwe polecenie lub polecenie zakończone błędami (np. zła nazwa skryptu)',
'Core:ExecProcess:Code255' => 'Błąd PHP (parsowanie lub środowisko uruchomieniowe)',
'Core:ExplainWTC:ElapsedTime' => 'Czas, który upłynął (przechowywany jako "%1$s")',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/pt_br.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
'Core:Duration_Seconds' => '%1$ds',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:ExecProcess:Code1' => 'Comando incorreto ou comando terminou com erros (por exemplo, nome do script errado)',
'Core:ExecProcess:Code255' => 'Erro PHP (parsing, ou runtime)',
'Core:ExplainWTC:ElapsedTime' => 'Tempo decorrido (armazenado como \"%1$s\")',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/ru.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$d ч %2$d мин %3$d с',
'Core:Duration_Minutes_Seconds' => '%1$d мин %2$d с',
'Core:Duration_Seconds' => '%1$d с',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:ExecProcess:Code1' => 'Неверная команда или команда завершена с ошибкой (возможно, неверное имя скрипта)',
'Core:ExecProcess:Code255' => 'Ошибка PHP (parsing, or runtime)',
'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as "%1$s")',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/sk.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
'Core:Duration_Seconds' => '%1$ds',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:ExecProcess:Code1' => 'Nesprávny príkaz alebo príkaz skončil s chybami (napr. nesprávne meno skriptu)',
'Core:ExecProcess:Code255' => 'PHP chyba (pri parsovaní, alebo počas behu)',
'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as "%1$s")~~',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/tr.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
'Core:Duration_Seconds' => '%1$ds',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:ExecProcess:Code1' => 'Yanlış komut veya komut hataları ile bitti (örneğin, yanlış senaryo adı)',
'Core:ExecProcess:Code255' => 'PHP hatası (ayrıştırma veya çalışma zamanı)',
'Core:ExplainWTC:ElapsedTime' => 'Geçen zaman (\"%1$s\" olarak saklanır)',
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/zh_cn.dictionary.itop.core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,8 @@
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
'Core:Duration_Seconds' => '%1$ds',
'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~',
'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~',
'Core:ExecProcess:Code1' => '命令错误或命令执行出错 (例如错误的脚本名称)',
'Core:ExecProcess:Code255' => 'PHP错误 (解析, 或运行时)',
'Core:ExplainWTC:ElapsedTime' => '耗时 (储存为 "%1$s")',
Expand Down
22 changes: 13 additions & 9 deletions pages/preferences.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
use Combodo\iTop\Application\WebPage\ErrorPage;
use Combodo\iTop\Application\WebPage\iTopWebPage;
use Combodo\iTop\Application\WebPage\WebPage;
use Combodo\iTop\Controller\Newsroom\iTopNewsroomController;
use Combodo\iTop\Controller\Notifications\NotificationsCenterController;
use Combodo\iTop\Service\InterfaceDiscovery\InterfaceDiscovery;
use Combodo\iTop\Service\Router\Router;
Expand All @@ -33,6 +34,7 @@
require_once(APPROOT.'/application/startup.inc.php');
IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);


/**
* Displays the user's changeable preferences
* @param $oP WebPage The web page used for the output
Expand Down Expand Up @@ -269,10 +271,10 @@ function ValidateOtherSettings()

$sNewsroomHtml = '';
$sNewsroomHtml .= '<form method="post">';
$iNewsroomDisplaySize = (int)appUserPreferences::GetPref('newsroom_display_size', 7);
$iNewsroomDisplaySize = (int)appUserPreferences::GetPref('newsroom_display_size', iTopNewsroomController::DEFAULT_NEWSROOM_DISPLAY_SIZE);

if ($iNewsroomDisplaySize < 1) $iNewsroomDisplaySize = 1;
if ($iNewsroomDisplaySize > 20) $iNewsroomDisplaySize = 20;
if ($iNewsroomDisplaySize < iTopNewsroomController::DEFAULT_NEWSROOM_MIN_DISPLAY_SIZE) $iNewsroomDisplaySize = iTopNewsroomController::DEFAULT_NEWSROOM_MIN_DISPLAY_SIZE;
if ($iNewsroomDisplaySize > iTopNewsroomController::DEFAULT_NEWSROOM_MAX_DISPLAY_SIZE) $iNewsroomDisplaySize = iTopNewsroomController::DEFAULT_NEWSROOM_MAX_DISPLAY_SIZE;
$sInput = '<input min="1" max="20" id="newsroom_display_size" type="number" size="2" name="newsroom_display_size" value="'.$iNewsroomDisplaySize.'">';
$sIcon = '<i id="newsroom_menu_icon" class="top-right-icon icon-additional-arrow fas fa-bell" style="top: 0;"></i>';
$sNewsroomHtml .= Dict::Format('UI:Newsroom:DisplayAtMost_X_Messages', $sInput, $sIcon);
Expand Down Expand Up @@ -852,6 +854,8 @@ function GetToastsPositionFieldBlock(): iUIBlock
DisplayPreferences($oPage);
break;
case 'apply_newsroom_preferences':


$iCountProviders = 0;
$oUser = UserRights::GetUserObject();
/** @var iNewsroomProvider[] $aProviders */
Expand All @@ -864,14 +868,14 @@ function GetToastsPositionFieldBlock(): iUIBlock
}
$bNewsroomEnabled = (MetaModel::GetConfig()->Get('newsroom_enabled') !== false);
if ($bNewsroomEnabled && ($iCountProviders > 0)) {
$iNewsroomDisplaySize = (int)utils::ReadParam('newsroom_display_size', 7);
if ($iNewsroomDisplaySize < 1) {
$iNewsroomDisplaySize = 1;
$iNewsroomDisplaySize = (int)utils::ReadParam('newsroom_display_size', iTopNewsroomController::DEFAULT_NEWSROOM_DISPLAY_SIZE);
if ($iNewsroomDisplaySize < iTopNewsroomController::DEFAULT_NEWSROOM_MIN_DISPLAY_SIZE) {
$iNewsroomDisplaySize = iTopNewsroomController::DEFAULT_NEWSROOM_MIN_DISPLAY_SIZE;
}
if ($iNewsroomDisplaySize > 20) {
$iNewsroomDisplaySize = 20;
if ($iNewsroomDisplaySize > iTopNewsroomController::DEFAULT_NEWSROOM_MAX_DISPLAY_SIZE) {
$iNewsroomDisplaySize = iTopNewsroomController::DEFAULT_NEWSROOM_MAX_DISPLAY_SIZE;
}
$iCurrentDisplaySize = (int)appUserPreferences::GetPref('newsroom_display_size', $iNewsroomDisplaySize);
$iCurrentDisplaySize = (int)appUserPreferences::GetPref('newsroom_display_size', iTopNewsroomController::DEFAULT_NEWSROOM_DISPLAY_SIZE);
if ($iCurrentDisplaySize != $iNewsroomDisplaySize) {
// Save the preference only if it differs from the current (or default) value
appUserPreferences::SetPref('newsroom_display_size', $iNewsroomDisplaySize);
Expand Down
4 changes: 4 additions & 0 deletions sources/Controller/Newsroom/iTopNewsroomController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@
class iTopNewsroomController extends Controller
{
public const ROUTE_NAMESPACE = 'itopnewsroom';
public const DEFAULT_NEWSROOM_DISPLAY_SIZE = 7;
public const DEFAULT_NEWSROOM_MIN_DISPLAY_SIZE = 1;
public const DEFAULT_NEWSROOM_MAX_DISPLAY_SIZE = 20;


/**
* @return iTopWebPage
Expand Down

0 comments on commit af8ff9b

Please sign in to comment.