Merge lp:~rvb/maas/storage-unit-bug-1387431 into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Fix storage unit on the node edit page.

[Julian Edwards (julian-edwards)]

:)

review: Approve

[Christian Reis (kiko)]

Didn't we just agree we shouldn't do this?

review: Needs Information

[Raphaël Badin (rvb)]

> Didn't we just agree we shouldn't do this?

That's not what I remember: we went back and forth on this because the original bug missed the main problem. The summary is this: the node listing page uses GB (probably to make the column more compact) but the information stored (and used on the node edit/view page) is MB, hence this fix.

What do you suggest we do instead?

[Christian Reis (kiko)]

Fine, fine. I was thinking back to the fact that we had said we would reuse the logic in the node listing in this page, but if you leave the bug open we can get to that later.

review: Approve

=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2014-10-30 11:08:43 +0000
+++ src/maasserver/forms.py	2014-10-30 12:48:28 +0000
@@ -616,7 +616,7 @@
     memory = forms.IntegerField(
         required=False, initial=0, label="Memory (MB)")
     storage = forms.IntegerField(
-        required=False, initial=0, label="Disk space (GB)")
+        required=False, initial=0, label="Disk space (MB)")
 
     class Meta:
         model = Node