commit ee6efd85e5c9ee8bcc606f0f2fdb5b8663973fa2
author Gunnar Mills <gmills@us.ibm.com> Wed Mar 21 15:31:56 2018 -0500
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Mar 29 13:44:58 2018 +0000
tree a05578d5fc2bb15026d151a388cc40c229bb57cf
parent 51b03887bf146392beb4518a3233a8bcf5c354a6

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>

app/configuration/controllers/firmware-controller.js

diff --git a/app/configuration/controllers/firmware-controller.js b/app/configuration/controllers/firmware-controller.js
index 812f471..b9a87b7 100644
--- a/app/configuration/controllers/firmware-controller.js
+++ b/app/configuration/controllers/firmware-controller.js
@@ -38,6 +38,7 @@
                     $scope.delete_image_version = "";
                     $scope.activate_image_id = "";
                     $scope.activate_image_version = "";
+                    $scope.activate_image_type = "";
                     $scope.priority_image_id = "";
                     $scope.priority_image_version = "";
                     $scope.priority_from = -1;
@@ -53,9 +54,10 @@
                         type: "warning"
                     };
 
-                    $scope.activateImage = function(imageId, imageVersion){
+                    $scope.activateImage = function(imageId, imageVersion, imageType){
                         $scope.activate_image_id = imageId;
                         $scope.activate_image_version = imageVersion;
+                        $scope.activate_image_type = imageType;
                         $scope.activate_confirm = true;
                     }