Skip to content
Snippets Groups Projects
Commit 4dcfcc20 authored by Michael Oehlhof's avatar Michael Oehlhof Committed by Stefan Neufeind
Browse files

[TASK] Show correct module action names for reports in bookmark list

Resolves: #71006
Releases: master
Change-Id: I699a8475df058175059710181073e40be3494372
Reviewed-on: https://review.typo3.org/44267


Reviewed-by: default avatarDaniel Goerz <ervaude@gmail.com>
Tested-by: default avatarDaniel Goerz <ervaude@gmail.com>
Reviewed-by: default avatarStefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: default avatarStefan Neufeind <typo3.neufeind@speedpartner.de>
parent 1f5f8293
Branches
Tags
No related merge requests found
...@@ -40,6 +40,13 @@ class ReportController extends ActionController ...@@ -40,6 +40,13 @@ class ReportController extends ActionController
*/ */
protected $defaultViewObjectName = BackendTemplateView::class; protected $defaultViewObjectName = BackendTemplateView::class;
/**
* Module name for the shortcut
*
* @var string
*/
protected $shortcutName;
/** /**
* Redirect to the saved report * Redirect to the saved report
* *
...@@ -148,6 +155,7 @@ class ReportController extends ActionController ...@@ -148,6 +155,7 @@ class ReportController extends ActionController
) )
->setTitle($lang->getLL('reports_overview')); ->setTitle($lang->getLL('reports_overview'));
$menu->addMenuItem($menuItem); $menu->addMenuItem($menuItem);
$this->shortcutName = $lang->getLL('reports_overview');
foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports'] as $extKey => $reports) { foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports'] as $extKey => $reports) {
foreach ($reports as $reportName => $report) { foreach ($reports as $reportName => $report) {
$menuItem = $menu $menuItem = $menu
...@@ -158,6 +166,7 @@ class ReportController extends ActionController ...@@ -158,6 +166,7 @@ class ReportController extends ActionController
if ($this->arguments->hasArgument('extension') && $this->arguments->hasArgument('report')) { if ($this->arguments->hasArgument('extension') && $this->arguments->hasArgument('report')) {
if ($this->arguments->getArgument('extension')->getValue() === $extKey && $this->arguments->getArgument('report')->getValue() === $reportName) { if ($this->arguments->getArgument('extension')->getValue() === $extKey && $this->arguments->getArgument('report')->getValue() === $reportName) {
$menuItem->setActive(true); $menuItem->setActive(true);
$this->shortcutName = $menuItem->getTitle();
} }
} }
$menu->addMenuItem($menuItem); $menu->addMenuItem($menuItem);
...@@ -182,6 +191,7 @@ class ReportController extends ActionController ...@@ -182,6 +191,7 @@ class ReportController extends ActionController
$shortcutButton = $buttonBar->makeShortcutButton() $shortcutButton = $buttonBar->makeShortcutButton()
->setModuleName($moduleName) ->setModuleName($moduleName)
->setGetVariables($getVars) ->setGetVariables($getVars)
->setDisplayName($this->shortcutName)
->setSetVariables($setVars); ->setSetVariables($setVars);
$buttonBar->addButton($shortcutButton); $buttonBar->addButton($shortcutButton);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment