Merge ~ltrager/maas:lp1788530 into maas:master

[Lee Trager]

LP: #1788530 - Only use maasForm size when defined.

I'm not sure this special case is still needed. This is happening because I first created a partition for the volume group to be on top of. $maasForm is defined but size is not. Would it be safer to remove this?

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1788530 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c665f9e37a4064000844733ea0b3b95387198b53

review: Approve

[Mike Pontillo (mpontillo)]

You'd have to test if it's safe to remove separately, but I think this added check is fine. Can't hurt to be defensive when working with Angular objects that might or might not exist.

review: Approve

diff --git a/src/maasserver/static/js/angular/controllers/node_details_storage.js b/src/maasserver/static/js/angular/controllers/node_details_storage.js
index 67792d1..4959d80 100644
--- a/src/maasserver/static/js/angular/controllers/node_details_storage.js
+++ b/src/maasserver/static/js/angular/controllers/node_details_storage.js
@@ -1240,7 +1240,8 @@ angular.module('MAAS').controller('NodeStorageController', [
             let size = disk.$options.size;
             // blr 2018-07-23: special cased as isAddLogicalVolumeSizeInvalid
             // calls this but has not yet migrated to maas-obj-form.
-            if($scope.newPartition.$maasForm) {
+            if($scope.newPartition.$maasForm &&
+                    $scope.newPartition.$maasForm.getValue('size')) {
                 size = $scope.newPartition.$maasForm.getValue('size');
             }
             if(size === "" || !isNumber(size)) {