This commit is contained in:
Molkobain
2020-01-24 15:37:53 +01:00
parent f878eea68d
commit 0a63568715
3 changed files with 45 additions and 25 deletions

View File

@@ -1,20 +1,21 @@
<?php
// Copyright (C) 2010-2017 Combodo SARL
//
// This file is part of iTop.
//
// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iTop is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
* Copyright (C) 2013-2020 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*/
/**
* Attachments rendering for iTop console.
@@ -319,8 +320,20 @@ JS;
}
/**
* Class TableDetailsAttachmentsRenderer
*/
class TableDetailsAttachmentsRenderer extends AbstractAttachmentsRenderer
{
/**
* @param bool $bWithDeleteButton
* @param array $aAttachmentsDeleted
*
* @throws \ArchivedObjectException
* @throws \CoreException
* @throws \CoreUnexpectedValue
* @throws \MySQLException
*/
private function AddAttachmentsTable($bWithDeleteButton, $aAttachmentsDeleted = array())
{
if ($this->GetAttachmentsCount() === 0)
@@ -404,14 +417,15 @@ JS
}
/**
* @param $bWithDeleteButton
* @param $bIsEven
* @param bool $bWithDeleteButton
* @param bool $bIsEven
* @param \DBObject $oAttachment
* @param array $aAttachmentsDate
* @param int[] $aAttachmentsDeleted
*
* @throws \ArchivedObjectException
* @throws \CoreException
* @throws \Exception
*/
private function AddAttachmentsTableLine($bWithDeleteButton, $bIsEven, $oAttachment, $aAttachmentsDate, $aAttachmentsDeleted)
{

View File

@@ -109,9 +109,7 @@ class UserProvider implements ContainerAwareInterface
}
/**
* Sets the container.
*
* @param \Symfony\Component\DependencyInjection\ContainerInterface|null $oContainer
* @inheritDoc
*/
public function setContainer(ContainerInterface $oContainer = null)
{

View File

@@ -1,7 +1,7 @@
<?php
/**
* Copyright (C) 2013-2019 Combodo SARL
* Copyright (C) 2013-2020 Combodo SARL
*
* This file is part of iTop.
*
@@ -57,6 +57,7 @@ class BsFileUploadFieldRenderer extends BsFieldRenderer
/**
* @inheritDoc
* @throws \CoreException
*/
public function Render()
{
@@ -76,7 +77,7 @@ class BsFileUploadFieldRenderer extends BsFieldRenderer
$sCollapseTogglerId = $sCollapseTogglerClass . '_' . $this->oField->GetGlobalId();
$sFieldWrapperId = 'form_upload_wrapper_' . $this->oField->GetGlobalId();
// if collapsed
// If collapsed
$sCollapseTogglerClass .= ' collapsed';
$sCollapseTogglerExpanded = 'false';
$sCollapseTogglerIconClass = $sCollapseTogglerIconHiddenClass;
@@ -397,7 +398,7 @@ JS
HTML
);
/** @var Attachment $oAttachment */
/** @var \Attachment $oAttachment */
while ($oAttachment = $this->oAttachmentsSet->Fetch())
{
$iAttId = $oAttachment->GetKey();
@@ -456,7 +457,13 @@ HTML
}
}
protected static function GetAttachmentTableHeader()
/**
* @param bool $bIsDeleteAllowed
*
* @return string
* @since 2.7.0
*/
protected static function GetAttachmentTableHeader($bIsDeleteAllowed)
{
$sTitleThumbnail = Dict::S('Attachments:File:Thumbnail');
$sTitleFileName = Dict::S('Attachments:File:Name');
@@ -487,6 +494,7 @@ HTML;
* @param boolean $bIsDeleteAllowed
*
* @return string
* @since 2.7.0
*/
protected static function GetAttachmentTableRow(
$iAttId, $sLineStyle, $sDocDownloadUrl, $sIconClass, $sAttachmentThumbUrl, $sFileName, $sAttachmentMeta, $sFileSize,