Skip to content

Fix model ids for adding, editing, deleting attachments #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 17, 2025
Merged

Fix model ids for adding, editing, deleting attachments #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f93804
Fix title translations
parapente Jul 16, 2025
6cc0e0f
Merge branch 'jmcameron:master' into master
parapente Jul 16, 2025
886c3dd
Properly fix the model ids for adding, editing, deleting attachments
parapente Jul 16, 2025
8585526
Use parent_id as part of the modal-id
parapente Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion attachments_component/site/src/Helper/AttachmentsHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2001,7 +2001,7 @@ public static function attachmentButtonsHTML($parent_type, $parent_id, $parent_e
$a_class = 'modal-button mx-2';
$tooltip = $add_attachment_txt;

$randomId = base64_encode('add');
$randomId = base64_encode('add' . $parent_id);
// Remove +,/,= from the $randomId
$randomId = strtr($randomId, "+/=", "AAA");
$modalParams['title'] = $tooltip === null ? '' : htmlspecialchars($tooltip, ENT_QUOTES, 'UTF-8');
Expand Down
6 changes: 3 additions & 3 deletions attachments_component/site/tmpl/attachments/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
$a_class = 'modal-button';
AttachmentsJavascript::setupModalJavascript();

$randomId = base64_encode('show' . $actual_filename);
$randomId = base64_encode('show' . $attachment->id . $actual_filename);
// Remove +,/,= from the $randomId
$randomId = strtr($randomId, "+/=", "AAA");
$modalParams['title'] = $this->escape($tooltip);
Expand Down Expand Up @@ -459,7 +459,7 @@
$update_url = str_replace('%d', (string)$attachment->id, $this->update_url);
$tooltip = Text::_('ATTACH_UPDATE_THIS_FILE') . ' (' . $actual_filename . ')';

$randomId = base64_encode('update' . $actual_filename);
$randomId = base64_encode('update' . $attachment->id . $actual_filename);
// Remove +,/,= from the $randomId
$randomId = strtr($randomId, "+/=", "AAA");
$modalParams['title'] = $this->escape($tooltip);
Expand Down Expand Up @@ -493,7 +493,7 @@
$delete_url = str_replace('%d', (string)$attachment->id, $this->delete_url);
$tooltip = Text::_('ATTACH_DELETE_THIS_FILE') . ' (' . $actual_filename . ')';

$randomId = base64_encode('delete' . $actual_filename);
$randomId = base64_encode('delete' . $attachment->id . $actual_filename);
// Remove +,/,= from the $randomId
$randomId = strtr($randomId, "+/=", "AAA");
$modalParams['title'] = $this->escape($tooltip);
Expand Down
2 changes: 1 addition & 1 deletion attachments_for_content/language/el-GR/el-GR.plg_attachments_attachments_for_content.sys.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
; Greek translation

ATTACH_ATTACHMENTS_FOR_CONTENT_PLUGIN_DESCRIPTION="Το πρόσθετο Συνημμένα για το Περιεχόμενο κάνει δυνατή την προσθήκη συνημμένων σε άρθρα καθώς και στις περιγραφές κατηγοριών."
PLG_ATTACHMENTS_FOR_CONTENT="Συνημμένα - Για Περιεχόμενο"
PLG_ATTACHMENTS_ATTACHMENTS_FOR_CONTENT="Συνημμένα - Για Περιεχόμενο"
2 changes: 1 addition & 1 deletion attachments_for_content/language/en-GB/en-GB.plg_attachments_attachments_for_content.sys.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
; English translation

ATTACH_ATTACHMENTS_FOR_CONTENT_PLUGIN_DESCRIPTION="The Attachments for Content plugin enables adding attachments to content articles as well as category descriptions."
PLG_ATTACHMENTS_FOR_CONTENT="Attachments - For Content"
PLG_ATTACHMENTS_ATTACHMENTS_FOR_CONTENT="Attachments - For Content"
2 changes: 1 addition & 1 deletion attachments_for_content/language/fr-FR/fr-FR.plg_attachments_attachments_for_content.sys.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
; French translation by: Marc-André Ladouceur (2.0), Pascal Adalian and Sylvain Faivre

ATTACH_ATTACHMENTS_FOR_CONTENT_PLUGIN_DESCRIPTION="Ce plugin permet l'ajout de pièces-jointes au contenu des articles et à la description des catégories."
PLG_ATTACHMENTS_FOR_CONTENT="Pièces jointes - Pour contenu"
PLG_ATTACHMENTS_ATTACHMENTS_FOR_CONTENT="Pièces jointes - Pour contenu"