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

N°3927 Fix Attachments delete button

Browse Source
This commit is contained in:
Stephen Abello
2021-06-02 10:01:06 +02:00
committed by Eric
parent 0957b55883
commit 67332837ad
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
datamodels/2.x/itop-attachments/renderers.itop-attachments.php
View File

@@ -24,6 +24,7 @@
*/ */
use Combodo\iTop\Application\UI\Base\Component\Button\Button;
use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Input\FileSelect\FileSelectUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Input\FileSelect\FileSelectUIBlockFactory;
@@ -358,13 +359,14 @@ JS
protected function GetDeleteAttachmentButton($iAttId) protected function GetDeleteAttachmentButton($iAttId)
{ {
$oButton = ButtonUIBlockFactory::MakeDestructiveIconLink('fas fa-trash', Dict::S('Attachments:DeleteBtn'), $oButton = ButtonUIBlockFactory::MakeIconAction('fas fa-trash', Dict::S('Attachments:DeleteBtn'),
'', '',
Dict::S('Attachments:DeleteBtn'), Dict::S('Attachments:DeleteBtn'),
null, false,
"btn_remove_".$iAttId); "btn_remove_".$iAttId);
$oButton->AddCSSClass('btn_hidden') $oButton->AddCSSClass('btn_hidden')
->SetOnClickJsCode("RemoveAttachment(".$iAttId.");"); ->SetOnClickJsCode("RemoveAttachment(".$iAttId.");")
->SetColor(Button::ENUM_COLOR_DESTRUCTIVE);
return $oButton; return $oButton;
} }
@@ -452,6 +454,18 @@ class TableDetailsAttachmentsRenderer extends AbstractAttachmentsRenderer
$this->oPage->AddUiBlock($oAttachmentTableBlock); $this->oPage->AddUiBlock($oAttachmentTableBlock);
$sTableId = $oAttachmentTableBlock->GetId(); $sTableId = $oAttachmentTableBlock->GetId();
foreach ($aData as $aAtt){
$sJS = $aAtt['js'];
$this->oPage->add_ready_script(
<<<JS
$('#$sTableId').on('init.dt draw.dt', function(){
$sJS
});
JS
);
}
} }
/** /**
@@ -540,6 +554,7 @@ class TableDetailsAttachmentsRenderer extends AbstractAttachmentsRenderer
'upload-date' => $sAttachmentDateFormatted, 'upload-date' => $sAttachmentDateFormatted,
'uploader' => $sAttachmentUploader, 'uploader' => $sAttachmentUploader,
'type' => $sFileType, 'type' => $sFileType,
'js' => '',
); );
if ($bWithDeleteButton) if ($bWithDeleteButton)
@@ -547,7 +562,7 @@ class TableDetailsAttachmentsRenderer extends AbstractAttachmentsRenderer
$sDeleteButton = $this->GetDeleteAttachmentButton($iAttachmentId); $sDeleteButton = $this->GetDeleteAttachmentButton($iAttachmentId);
$oBlockRenderer = new BlockRenderer($sDeleteButton); $oBlockRenderer = new BlockRenderer($sDeleteButton);
$this->oPage->add_ready_script($oBlockRenderer->RenderJsInline($sDeleteButton::ENUM_JS_TYPE_ON_INIT)); $aAttachmentLine['js'] .= $oBlockRenderer->RenderJsInline($sDeleteButton::ENUM_JS_TYPE_ON_INIT);
$aAttachmentLine['delete'] = $oBlockRenderer->RenderHtml(); $aAttachmentLine['delete'] = $oBlockRenderer->RenderHtml();
} }