From af8ff9b29f379837a2056e8488bc892af1f86161 Mon Sep 17 00:00:00 2001 From: XGUI Date: Thu, 28 Nov 2024 16:02:35 +0100 Subject: [PATCH] Issue/7707 (#687) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * N°7707 - Newsroom user preference display counter not changeable --- core/datamodel.core.xml | 6 +++++ dictionaries/cs.dictionary.itop.core.php | 2 ++ dictionaries/da.dictionary.itop.core.php | 2 ++ dictionaries/de.dictionary.itop.core.php | 2 ++ dictionaries/en.dictionary.itop.core.php | 2 ++ dictionaries/es_cr.dictionary.itop.core.php | 2 ++ dictionaries/fr.dictionary.itop.core.php | 2 ++ dictionaries/hu.dictionary.itop.core.php | 2 ++ dictionaries/it.dictionary.itop.core.php | 2 ++ dictionaries/ja.dictionary.itop.core.php | 2 ++ dictionaries/nl.dictionary.itop.core.php | 2 ++ dictionaries/pl.dictionary.itop.core.php | 2 ++ dictionaries/pt_br.dictionary.itop.core.php | 2 ++ dictionaries/ru.dictionary.itop.core.php | 2 ++ dictionaries/sk.dictionary.itop.core.php | 2 ++ dictionaries/tr.dictionary.itop.core.php | 2 ++ dictionaries/zh_cn.dictionary.itop.core.php | 2 ++ pages/preferences.php | 22 +++++++++++-------- .../Newsroom/iTopNewsroomController.php | 4 ++++ 19 files changed, 55 insertions(+), 9 deletions(-) diff --git a/core/datamodel.core.xml b/core/datamodel.core.xml index f99367904..bea18700c 100644 --- a/core/datamodel.core.xml +++ b/core/datamodel.core.xml @@ -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(); + } } } diff --git a/dictionaries/cs.dictionary.itop.core.php b/dictionaries/cs.dictionary.itop.core.php index 3e95c1cc4..c43f4d475 100755 --- a/dictionaries/cs.dictionary.itop.core.php +++ b/dictionaries/cs.dictionary.itop.core.php @@ -807,6 +807,8 @@ Je-li čas vynechán, bude nastaveno 00:00:00 '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")', diff --git a/dictionaries/da.dictionary.itop.core.php b/dictionaries/da.dictionary.itop.core.php index 5f83d5e5b..8edf74b81 100644 --- a/dictionaries/da.dictionary.itop.core.php +++ b/dictionaries/da.dictionary.itop.core.php @@ -806,6 +806,8 @@ If the time is omitted, it defaults to 00:00:00 '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")~~', diff --git a/dictionaries/de.dictionary.itop.core.php b/dictionaries/de.dictionary.itop.core.php index fa214dfd3..1dd0b2f68 100644 --- a/dictionaries/de.dictionary.itop.core.php +++ b/dictionaries/de.dictionary.itop.core.php @@ -808,6 +808,8 @@ Falls der Zeit-Wert weggelassen wird, ist der Standardwert 00:00:00 '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\")', diff --git a/dictionaries/en.dictionary.itop.core.php b/dictionaries/en.dictionary.itop.core.php index 932bd36e9..95f98adeb 100644 --- a/dictionaries/en.dictionary.itop.core.php +++ b/dictionaries/en.dictionary.itop.core.php @@ -514,6 +514,8 @@ Dict::Add('EN US', 'English', 'English', array( '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', )); // diff --git a/dictionaries/es_cr.dictionary.itop.core.php b/dictionaries/es_cr.dictionary.itop.core.php index 16f7273ab..4450cdfc9 100644 --- a/dictionaries/es_cr.dictionary.itop.core.php +++ b/dictionaries/es_cr.dictionary.itop.core.php @@ -792,6 +792,8 @@ Si se omite el tiempo, por omisión es 00:00:00 '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\")', diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php index e45f7f39e..80e61b61e 100644 --- a/dictionaries/fr.dictionary.itop.core.php +++ b/dictionaries/fr.dictionary.itop.core.php @@ -835,6 +835,8 @@ Si l\'heure n\'est pas spécifiée, cela revient à 00:00:00 (minuit) '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")', diff --git a/dictionaries/hu.dictionary.itop.core.php b/dictionaries/hu.dictionary.itop.core.php index fb0d8a193..4a0dd1556 100755 --- a/dictionaries/hu.dictionary.itop.core.php +++ b/dictionaries/hu.dictionary.itop.core.php @@ -801,6 +801,8 @@ Ha az időpontot nem adja meg, akkor az alapértelmezett értéke 00:00:00 '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)', diff --git a/dictionaries/it.dictionary.itop.core.php b/dictionaries/it.dictionary.itop.core.php index a8c358f3d..aaa3ba74a 100644 --- a/dictionaries/it.dictionary.itop.core.php +++ b/dictionaries/it.dictionary.itop.core.php @@ -802,6 +802,8 @@ Se \'oraè omessa, di default è 00:00:00 '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\")', diff --git a/dictionaries/ja.dictionary.itop.core.php b/dictionaries/ja.dictionary.itop.core.php index a1680bed2..c554c54a4 100644 --- a/dictionaries/ja.dictionary.itop.core.php +++ b/dictionaries/ja.dictionary.itop.core.php @@ -812,6 +812,8 @@ Operators:
'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' => '管理者またはデータ·ソースに指定されたユーザーのみ、この操作を実行することができます。操作はキャンセルされました。', diff --git a/dictionaries/nl.dictionary.itop.core.php b/dictionaries/nl.dictionary.itop.core.php index 7c4e514bb..6d6e29552 100644 --- a/dictionaries/nl.dictionary.itop.core.php +++ b/dictionaries/nl.dictionary.itop.core.php @@ -804,6 +804,8 @@ Hier wordt standaard \'00:00:00\' van gemaakt als er geen tijd wordt opgegeven. '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")', diff --git a/dictionaries/pl.dictionary.itop.core.php b/dictionaries/pl.dictionary.itop.core.php index afac1a3cf..11f5ec951 100644 --- a/dictionaries/pl.dictionary.itop.core.php +++ b/dictionaries/pl.dictionary.itop.core.php @@ -803,6 +803,8 @@ Jeśli czas zostanie pominięty, domyślnie to 00:00:00 '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")', diff --git a/dictionaries/pt_br.dictionary.itop.core.php b/dictionaries/pt_br.dictionary.itop.core.php index 90a0ac81c..770292ba2 100644 --- a/dictionaries/pt_br.dictionary.itop.core.php +++ b/dictionaries/pt_br.dictionary.itop.core.php @@ -801,6 +801,8 @@ Se o tempo for omitido, o padrão é 00:00:00 '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\")', diff --git a/dictionaries/ru.dictionary.itop.core.php b/dictionaries/ru.dictionary.itop.core.php index df5e969ca..bad043e08 100644 --- a/dictionaries/ru.dictionary.itop.core.php +++ b/dictionaries/ru.dictionary.itop.core.php @@ -806,6 +806,8 @@ If omitted the From (label) is used.~~', '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")', diff --git a/dictionaries/sk.dictionary.itop.core.php b/dictionaries/sk.dictionary.itop.core.php index 7ecd34fdb..0ff12ee48 100644 --- a/dictionaries/sk.dictionary.itop.core.php +++ b/dictionaries/sk.dictionary.itop.core.php @@ -825,6 +825,8 @@ Ak je čas vynechaný, predvolený čas je 00:00:00 '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")~~', diff --git a/dictionaries/tr.dictionary.itop.core.php b/dictionaries/tr.dictionary.itop.core.php index 74e19bbeb..df3ed2329 100644 --- a/dictionaries/tr.dictionary.itop.core.php +++ b/dictionaries/tr.dictionary.itop.core.php @@ -806,6 +806,8 @@ If the time is omitted, it defaults to 00:00:00 '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)', diff --git a/dictionaries/zh_cn.dictionary.itop.core.php b/dictionaries/zh_cn.dictionary.itop.core.php index e34401268..0501a7d2e 100644 --- a/dictionaries/zh_cn.dictionary.itop.core.php +++ b/dictionaries/zh_cn.dictionary.itop.core.php @@ -822,6 +822,8 @@ Operators:
'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")', diff --git a/pages/preferences.php b/pages/preferences.php index a5495291c..707cf19eb 100644 --- a/pages/preferences.php +++ b/pages/preferences.php @@ -24,6 +24,7 @@ use Combodo\iTop\Application\UI\Preferences\BlockShortcuts\BlockShortcuts; 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; @@ -33,6 +34,7 @@ require_once(APPROOT.'/application/application.inc.php'); 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 @@ -269,10 +271,10 @@ JS $sNewsroomHtml = ''; $sNewsroomHtml .= '
'; - $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 = ''; $sIcon = ''; $sNewsroomHtml .= Dict::Format('UI:Newsroom:DisplayAtMost_X_Messages', $sInput, $sIcon); @@ -852,6 +854,8 @@ try { DisplayPreferences($oPage); break; case 'apply_newsroom_preferences': + + $iCountProviders = 0; $oUser = UserRights::GetUserObject(); /** @var iNewsroomProvider[] $aProviders */ @@ -864,14 +868,14 @@ try { } $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); diff --git a/sources/Controller/Newsroom/iTopNewsroomController.php b/sources/Controller/Newsroom/iTopNewsroomController.php index 5d737da60..134af6c31 100644 --- a/sources/Controller/Newsroom/iTopNewsroomController.php +++ b/sources/Controller/Newsroom/iTopNewsroomController.php @@ -48,6 +48,10 @@ use appUserPreferences; 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