mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-25 11:18:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed an exception on part tables, when an attachment is external.

Browse source
This commit is contained in:
Jan Böhmer 2019-11-10 19:58:35 +01:00
parent 2f1ff14a54
commit 09995330af
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/css/tagsinput.css
View file

@ -1,6 +1,7 @@
/* /*
* bootstrap-tagsinput v0.8.0 * bootstrap-tagsinput v0.8.0
* * Modified by Jan Böhmer 2019
* (Added some margin between the tags.
*/ */
.bootstrap-tagsinput { .bootstrap-tagsinput {

4
src/DataTables/Column/PartAttachmentsColumn.php
View file

@ -38,7 +38,7 @@ class PartAttachmentsColumn extends AbstractColumn
protected $FAIconGenerator; protected $FAIconGenerator;
protected $urlGenerator; protected $urlGenerator;
public function __construct(FAIconGenerator $FAIconGenerator, AttachmentURLGenerator $urlGenerator) public function __construct(FAIconGenerator $FAIconGenerator, EntityURLGenerator $urlGenerator)
{ {
$this->FAIconGenerator = $FAIconGenerator; $this->FAIconGenerator = $FAIconGenerator;
$this->urlGenerator = $urlGenerator; $this->urlGenerator = $urlGenerator;
@ -74,7 +74,7 @@ class PartAttachmentsColumn extends AbstractColumn
/** @var Attachment $attachment */ /** @var Attachment $attachment */
$tmp .= sprintf( $tmp .= sprintf(
'<a href="%s" title="%s" class="attach-table-icon" target="_blank" rel="noopener" data-no-ajax>%s</a>', '<a href="%s" title="%s" class="attach-table-icon" target="_blank" rel="noopener" data-no-ajax>%s</a>',
$this->urlGenerator->getViewURL($attachment), $this->urlGenerator->viewURL($attachment),
htmlspecialchars($attachment->getName()) . ': ' . htmlspecialchars($attachment->getFilename()), htmlspecialchars($attachment->getName()) . ': ' . htmlspecialchars($attachment->getFilename()),
$this->FAIconGenerator->generateIconHTML( $this->FAIconGenerator->generateIconHTML(
$this->FAIconGenerator->fileExtensionToFAType($attachment->getExtension()), $this->FAIconGenerator->fileExtensionToFAType($attachment->getExtension()),