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

N°3921 - Attribute file: Simplify size format in the backoffice (similar to the portal)

Browse Source
This commit is contained in:
Molkobain
2021-04-12 10:21:28 +02:00
parent 530ec111ef
commit 5878b18b02
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/cmdbchangeop.class.inc.php
View File

@@ -436,24 +436,19 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
$oMonoObjectSet = new DBObjectSet($oTargetSearch);
if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
{
if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
{
if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode'))) {
$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
$sAttName = $oAttDef->GetLabel();
}
else
{
} else {
// The attribute was renamed or removed from the object ?
$sAttName = $this->Get('attcode');
}
/** @var \ormDocument $oPrevDoc */
$oPrevDoc = $this->Get('prevdata');
if ($oPrevDoc->IsEmpty())
{
if ($oPrevDoc->IsEmpty()) {
$sPrevious = '';
$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sPrevious);
}
else
{
} else {
$sFieldAsHtml = $oPrevDoc->GetAsHTML();
$sDisplayLabel = Dict::S('UI:OpenDocumentInNewWindow_');
@@ -463,7 +458,7 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
$sDownloadUrl = $oPrevDoc->GetDownloadURL(get_class($this), $this->GetKey(), 'prevdata');
$sDocView = <<<HTML
{$sFieldAsHtml}<br>
{$sFieldAsHtml}
<a href="{$sDisplayUrl}" target="_blank">{$sDisplayLabel}</a> / <a href="{$sDownloadUrl}">{$sDownloadLabel}</a>
HTML;
$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sDocView);

3
core/ormdocument.class.inc.php
View File

@@ -118,7 +118,8 @@ class ormDocument
else
{
$data = $this->GetData();
$sResult = htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8').' [ '.$this->GetMimeType().', size: '.strlen($data).' byte(s) ]<br/>';
$sSize = utils::BytesToFriendlyFormat(strlen($data));
$sResult = htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8').' ('.$sSize.')<br/>';
}
return $sResult;
}