composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 08:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source
This commit is contained in:
Molkobain
2022-03-23 09:49:11 +01:00
parent 1db4b9a12e 73c6b4be20
commit ad4442ae78
27 changed files with 480 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

403
datamodels/2.x/itop-portal-base/portal/public/css/portal.css
View File

File diff suppressed because it is too large Load Diff

5
datamodels/2.x/itop-portal-base/portal/public/css/portal.scss
View File

@@ -1571,13 +1571,8 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
}
}
.attachment-tooltip {
width: 350px;
height: 300px;
img {
max-width: 100%;
max-height: 100%;
}
}
.upload_container input{

2
datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php
View File

@@ -1244,7 +1244,7 @@ class ObjectController extends BrickController
}
$aData['att_id'] = $iAttId;
$aData['preview'] = $oDocument->IsPreviewAvailable() ? 'true' : 'false';
$aData['preview'] = $oDocument->IsPreviewAvailable() ;
$aData['file_size'] = $oDocument->GetFormattedSize();
$aData['creation_date'] = $oAttachment->Get('creation_date');
$aData['user_id_friendlyname'] = $oAttachment->Get('user_id_friendlyname');