Move from "Preserve settings" to "Confirm Activation"
The "Preserve settings" popup that showed when a user activated
an image was not useful and did not do anything. Saving network
settings prior to activation is not needed so moved to a
"Confirm Activation" modal.
This modal will eventually include an
"activate BMC firmware and reboot" selection,
openbmc/openbmc#3027, for now it only holds the one selection.
The "Preserve settings" and now this "Confirm Activation"
modal both appear on "server" and "BMC" images, this is a bug
that is fixed in a later commit.
Tested: Activated an image on a Witherspoon machine.
Change-Id: I7176d5a314ea325e6e94606ef07b32786ede64e9
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/app/common/directives/firmware-list.html b/app/common/directives/firmware-list.html
index 375b63c..3c2d826 100644
--- a/app/common/directives/firmware-list.html
+++ b/app/common/directives/firmware-list.html
@@ -57,7 +57,7 @@
</div>
<div class="table__cell firmware__action">
<span class="table__cell-label">Action:</span>
- <button class="firmware__action-link" ng-show="firmware.activationStatus == 'Ready'" ng-click="activate(firmware.imageId)">Activate</button>
+ <button class="firmware__action-link" ng-show="firmware.activationStatus == 'Ready'" ng-click="activate(firmware.imageId, firmware.Version)">Activate</button>
<button class="firmware__action-link" ng-show="firmware.activationStatus != 'Functional'" ng-click="delete(firmware.imageId, firmware.Version)">Delete</button>
</div>
</div>
diff --git a/app/common/directives/firmware-list.js b/app/common/directives/firmware-list.js
index 0404fe6..a4cc58f 100644
--- a/app/common/directives/firmware-list.js
+++ b/app/common/directives/firmware-list.js
@@ -15,8 +15,8 @@
},
'controller': ['$rootScope', '$scope','dataService', '$location', '$timeout', function($rootScope, $scope, dataService, $location, $timeout){
$scope.dataService = dataService;
- $scope.activate = function(imageId){
- $scope.$parent.activateImage(imageId);
+ $scope.activate = function(imageId, imageVersion){
+ $scope.$parent.activateImage(imageId, imageVersion);
}
$scope.delete = function(imageId, imageVersion){