Add server confirm activation modal
Added text specific to server images that appears in the
activation modal when a "server" image is activated.
The "server" and "BMC" images use the same modal, but the text
and if radio buttons appear differ.
Resolves openbmc/openbmc#2967
Tested: Activated both a server and BMC image on a Witherspoon.
Change-Id: I83693641ebfef802d403141ade55a950f359ba6e
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 3c2d826..887548c 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, firmware.Version)">Activate</button>
+ <button class="firmware__action-link" ng-show="firmware.activationStatus == 'Ready'" ng-click="activate(firmware.imageId, firmware.Version, firmware.imageType)">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 a4cc58f..4cdf6d7 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, imageVersion){
- $scope.$parent.activateImage(imageId, imageVersion);
+ $scope.activate = function(imageId, imageVersion, imageType){
+ $scope.$parent.activateImage(imageId, imageVersion, imageType);
}
$scope.delete = function(imageId, imageVersion){