Skip to content
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

Jump to bottom

[BUGFIX] Fix passing page id in ToolboxController #1372

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+2 −2
Open

[BUGFIX] Fix passing page id in ToolboxController #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
354b897
Fix passing page id in `ToolboxController`
beatrycze-volk Nov 7, 2024
bfded86
Merge branch 'master' into fix-pid
sebastian-meyer Nov 11, 2024
5744d32
Merge branch 'master' into fix-pid
sebastian-meyer Nov 11, 2024
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 Classes/Controller/ToolboxController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@

/**
* Renders the annotation tool (used in template)
* @SuppressWarnings(PHPMD.UnusedPrivateMethod)

Check failure on line 161 in Classes/Controller/ToolboxController.php

View workflow job for this annotation

GitHub Actions / Static Code Analysis 

PHPDoc tag @SuppressWarnings has invalid value ((PHPMD.UnusedPrivateMethod)): Unexpected token ".UnusedPrivateMethod)", expected ')' at offset 88 on line 3
*
* @access private
*
Expand Down Expand Up @@ -186,7 +186,7 @@

/**
* Renders the fulltext download tool (used in template)
* @SuppressWarnings(PHPMD.UnusedPrivateMethod)

Check failure on line 189 in Classes/Controller/ToolboxController.php

View workflow job for this annotation

GitHub Actions / Static Code Analysis 

PHPDoc tag @SuppressWarnings has invalid value ((PHPMD.UnusedPrivateMethod)): Unexpected token ".UnusedPrivateMethod)", expected ')' at offset 95 on line 3
*
* @access private
*
Expand Down Expand Up @@ -516,7 +516,7 @@
'labelHighlightWord' => $this->settings['highlightWordInputName'],
'labelEncrypted' => $this->settings['encryptedInputName'],
'documentId' => $this->getCurrentDocumentId(),
'documentPageId' => $this->document->getPid(),
'pageId' => $this->request->getAttribute('routing')->getPageId(),
'solrEncrypted' => $this->getEncryptedCoreName() ? : ''
];

Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Templates/Toolbox/Main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
<input type="submit" id="tx-dlf-search-in-document-button" value="{f:translate(key: 'search.submit')}" onclick="resetStart();" />
<input type="hidden" id="tx-dlf-search-in-document-start" name="{searchInDocument.labelStart}" value="0" />
<input type="hidden" id="tx-dlf-search-in-document-id" name="{searchInDocument.labelId}" value="{searchInDocument.documentId}" />
<input type="hidden" id="tx-dlf-search-in-document-pid" name="{searchInDocument.labelPid}" value="{searchInDocument.documentPageId}" />
<input type="hidden" id="tx-dlf-search-in-document-pid" name="{searchInDocument.labelPid}" value="{searchInDocument.pageId}" />
<input type="hidden" id="tx-dlf-search-in-document-page" name="{searchInDocument.labelPageUrl}" />
<input type="hidden" id="tx-dlf-search-in-document-highlight-word" name="{searchInDocument.labelHighlightWord}" />
<input type="hidden" id="tx-dlf-search-in-document-encrypted" name="{searchInDocument.labelEncrypted}" value="{searchInDocument.solrEncrypted}" />
Expand Down
Loading