composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

7707 - replace hardcoded values for min, max and default newsroom display size with constants

Browse Source
This commit is contained in:
xavier.guiboud-ribaud@combodo.com
2024-11-22 11:55:26 +01:00
parent f7c0ae14c1
commit c36e6609dc
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pages/preferences.php
View File

@@ -33,6 +33,10 @@ require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/startup.inc.php'); require_once(APPROOT.'/application/startup.inc.php');
IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST); IssueLog::Trace('----- Request: '.utils::GetRequestUri(), LogChannels::WEB_REQUEST);
const MAX_NEWSROOM_DISPLAY_SIZE = 20;
const MIN_NEWSROOM_DISPLAY_SIZE = 1;
const DEFAULT_NEWSROOM_DISPLAY_SIZE = 7;
/** /**
* Displays the user's changeable preferences * Displays the user's changeable preferences
* @param $oP WebPage The web page used for the output * @param $oP WebPage The web page used for the output
@@ -269,10 +273,10 @@ JS
$sNewsroomHtml = ''; $sNewsroomHtml = '';
$sNewsroomHtml .= '<form method="post">'; $sNewsroomHtml .= '<form method="post">';
$iNewsroomDisplaySize = (int)appUserPreferences::GetPref('newsroom_display_size', 7); $iNewsroomDisplaySize = (int)appUserPreferences::GetPref('newsroom_display_size', DEFAULT_NEWSROOM_DISPLAY_SIZE);
if ($iNewsroomDisplaySize < 1) $iNewsroomDisplaySize = 1; if ($iNewsroomDisplaySize < MIN_NEWSROOM_DISPLAY_SIZE) $iNewsroomDisplaySize = MIN_NEWSROOM_DISPLAY_SIZE;
if ($iNewsroomDisplaySize > 20) $iNewsroomDisplaySize = 20; if ($iNewsroomDisplaySize > MAX_NEWSROOM_DISPLAY_SIZE) $iNewsroomDisplaySize = MAX_NEWSROOM_DISPLAY_SIZE;
$sInput = '<input min="1" max="20" id="newsroom_display_size" type="number" size="2" name="newsroom_display_size" value="'.$iNewsroomDisplaySize.'">'; $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>'; $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); $sNewsroomHtml .= Dict::Format('UI:Newsroom:DisplayAtMost_X_Messages', $sInput, $sIcon);
@@ -852,6 +856,8 @@ try {
DisplayPreferences($oPage); DisplayPreferences($oPage);
break; break;
case 'apply_newsroom_preferences': case 'apply_newsroom_preferences':
$iCountProviders = 0; $iCountProviders = 0;
$oUser = UserRights::GetUserObject(); $oUser = UserRights::GetUserObject();
/** @var iNewsroomProvider[] $aProviders */ /** @var iNewsroomProvider[] $aProviders */
@@ -864,14 +870,14 @@ try {
} }
$bNewsroomEnabled = (MetaModel::GetConfig()->Get('newsroom_enabled') !== false); $bNewsroomEnabled = (MetaModel::GetConfig()->Get('newsroom_enabled') !== false);
if ($bNewsroomEnabled && ($iCountProviders > 0)) { if ($bNewsroomEnabled && ($iCountProviders > 0)) {
$iNewsroomDisplaySize = (int)utils::ReadParam('newsroom_display_size', 7); $iNewsroomDisplaySize = (int)utils::ReadParam('newsroom_display_size', DEFAULT_NEWSROOM_DISPLAY_SIZE);
if ($iNewsroomDisplaySize < 1) { if ($iNewsroomDisplaySize < MIN_NEWSROOM_DISPLAY_SIZE) {
$iNewsroomDisplaySize = 1; $iNewsroomDisplaySize = MIN_NEWSROOM_DISPLAY_SIZE;
} }
if ($iNewsroomDisplaySize > 20) { if ($iNewsroomDisplaySize > MAX_NEWSROOM_DISPLAY_SIZE) {
$iNewsroomDisplaySize = 20; $iNewsroomDisplaySize = MAX_NEWSROOM_DISPLAY_SIZE;
} }
$iCurrentDisplaySize = (int)appUserPreferences::GetPref('newsroom_display_size', 7); $iCurrentDisplaySize = (int)appUserPreferences::GetPref('newsroom_display_size', DEFAULT_NEWSROOM_DISPLAY_SIZE);
if ($iCurrentDisplaySize != $iNewsroomDisplaySize) { if ($iCurrentDisplaySize != $iNewsroomDisplaySize) {
// Save the preference only if it differs from the current (or default) value // Save the preference only if it differs from the current (or default) value
appUserPreferences::SetPref('newsroom_display_size', $iNewsroomDisplaySize); appUserPreferences::SetPref('newsroom_display_size', $iNewsroomDisplaySize);