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

Fixed 24990: link doesn't redirect to dashboard #26100

Merged
merged 10 commits into from
Apr 2, 2020
Merged

Fixed 24990: link doesn't redirect to dashboard #26100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5a5091c
Fixed 24990 link not to redirect to dashboard
Usik2203 Dec 18, 2019
1818eaf
Fixed codeStyle issues
Usik2203 Jan 30, 2020
c98e03f
fixed classes with new keyword
Usik2203 Feb 3, 2020
8c672eb
Fixed Code style issues
Usik2203 Feb 4, 2020
b90f20c
Fix issue with UnitTests
Usik2203 Feb 17, 2020
531a22f
Merge branch '2.4-develop' into 24990-logo-link-is-not-directing-to-a…
Usik2203 Mar 30, 2020
4336cf1
Small fix
eduard13 Mar 31, 2020
f39a494
Changes covered by MFTF
Usik2203 Mar 31, 2020
31bbf07
Refactored MFTF
Usik2203 Mar 31, 2020
e1b0ff0
Minor fixes
eduard13 Mar 31, 2020
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
13 changes: 12 additions & 1 deletion setup/src/Magento/Setup/Controller/Navigation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Zend\View\Model\JsonModel;
use Zend\View\Model\ViewModel;
use Magento\Setup\Model\Cron\Status;
use Magento\Setup\Model\ObjectManagerProvider;

/**
* Class Navigation
Expand All @@ -32,14 +33,20 @@ class Navigation extends AbstractActionController
*/
protected $view;

/**
* @var ObjectManagerProvider $objectManagerProvider
*/
protected $objectManagerProvider;

/**
* @param NavModel $navigation
* @param Status $status
*/
public function __construct(NavModel $navigation, Status $status)
public function __construct(NavModel $navigation, Status $status, ObjectManagerProvider $objectManagerProvider)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you use ObjectManagerProvider instead of injecting just UrlInterface?

Copy link
Contributor Author

@Usik2203 Usik2203 Jan 8, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am getting such error "An error occurred during execution; please try again later" and status 500 while injecting UrlInterface directly in constructor of controller

{
$this->navigation = $navigation;
$this->status = $status;
$this->objectManagerProvider = $objectManagerProvider;
$this->view = new ViewModel;
$this->view->setVariable('menu', $this->navigation->getMenuItems());
$this->view->setVariable('main', $this->navigation->getMainItems());
Expand Down Expand Up @@ -75,8 +82,12 @@ public function menuAction()
*/
public function sideMenuAction()
{
/** @var \Magento\Backend\Model\UrlInterface $backendUrl */
$backendUrl = $this->objectManagerProvider->get()->get(\Magento\Backend\Model\UrlInterface::class);

$this->view->setTemplate('/magento/setup/navigation/side-menu.phtml');
$this->view->setVariable('isInstaller', $this->navigation->getType() == NavModel::NAV_INSTALLER);
$this->view->setVariable('backendUrl', $backendUrl->getRouteUrl('adminhtml'));
$this->view->setTerminal(true);
return $this->view;
}
Expand Down
8 changes: 5 additions & 3 deletions setup/view/magento/setup/navigation/side-menu.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
ng-show="<?= implode( '&&', $expressions) ?>"
>
<nav class="admin__menu" ng-controller="mainController">
<span class="logo logo-static" data-edition="Community Edition">
<img class="logo-img" src="<?= $this->basePath() ?>/pub/images/logo.svg" alt="Magento Admin Panel">
</span>
<a href="<?= $this->backendUrl ?>" class="logo" data-edition="Community Edition">
<span>
<img class="logo-img" src="<?= $this->basePath() ?>/pub/images/logo.svg" alt="Magento Admin Panel">
</span>
</a>
<ul id="nav" role="menubar">
<li class="item-home level-0" ng-class="{_active: $state.current.name === 'root.home'}">
<a href="" ui-sref="root.home">
Expand Down