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

fix: set message-success in setup if we already have the latest version #15012

Merged
merged 2 commits into from May 8, 2018
Merged

fix: set message-success in setup if we already have the latest version #15012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d3ff22
fix: set message-success in setup if we already have the latest version
DanielRuf May 5, 2018
ce12396
fix: break line into multiple lines to fix PHPCS violation
DanielRuf May 5, 2018
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: 2 additions & 0 deletions setup/pub/magento/setup/select-version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ angular.module('select-version', ['ngStorage'])
$scope.upgradeReadyForNext = false;
$scope.upgradeProcessed = false;
$scope.upgradeProcessError = false;
$scope.upgradeAlreadyLatestVersion = false;
$scope.upgradeProcessErrorMessage = '';
$scope.componentsReadyForNext = true;
$scope.componentsProcessed = false;
Expand All @@ -39,6 +40,7 @@ angular.module('select-version', ['ngStorage'])

if ($scope.upgradeProcessError) {
$scope.upgradeProcessErrorMessage = "You're already using the latest version, there's nothing for us to do.";
$scope.upgradeAlreadyLatestVersion = true;
} else {
$scope.selectedOption = [];
$scope.versions = [];
Expand Down
5 changes: 4 additions & 1 deletion setup/view/magento/setup/select-version.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@
</span>
<span class="message-text">Checking for a new version...</span>
</div>
<div class="message message-error" ng-show="upgradeProcessError">
<div
class="message"
ng-class="upgradeAlreadyLatestVersion ? 'message-success' : 'message-error'"
ng-show="upgradeProcessError">
<span class="message-text" ng-bind-html="upgradeProcessErrorMessage"></span>
</div>
<div class="message" ng-show="upgradeProcessed && !upgradeProcessError && currentVersion">
Expand Down