Fix size field formatting on resize and clone pages

subuk · Nov 25, 2019 · b2647f6 · b2647f6
1 parent ef8e3ca
commit b2647f6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/compute/volume.go b/compute/volume.go
@@ -22,6 +22,10 @@ type Volume struct {
 	Metadata   VolumeMetadata
 }
 
+func (v *Volume) SizeMb() uint64 {
+	return v.Size / 1024 / 1024
+}
+
 func (volume *Volume) Base() string {
 	return filepath.Base(volume.Path)
 }

diff --git a/templates/volume/clone.html b/templates/volume/clone.html
@@ -19,7 +19,7 @@ <h4>Clone Volume {{ .Volume.Path }}</h4>
                 <label>New Volume Pool</label>
                 <select required="required" class="form-control" name="Pool">
                   {{ range .Pools }}
-                    <option value="{{ .Name }}">{{ .Name }} ({{ .FreeGB }}G free {{ .UsagePercent }}% used)</option>
+                    <option value="{{ .Name }}">{{ .Name }} ({{ .Free | HumanizeBytes }} free {{ .UsagePercent }}% used)</option>
                   {{ end }}
                 </select>
               </div>
@@ -44,8 +44,8 @@ <h4>Clone Volume {{ .Volume.Path }}</h4>
             <div class="form-group row">
               <div class="col-md-12">
                 <label>New Volume Size (megabytes)</label>
-                <input value="{{ .Volume.Size }}" required="required" name="Size" class="form-control" id="Size">
-                <small id="nameHelp" class="form-text text-muted">Volume can be resized after creation</small>
+                <input value="{{ .Volume.SizeMb }}" required="required" name="Size" class="form-control" id="Size">
+                <small id="nameHelp" class="form-text text-muted">LVM volumes cannot be resized after creation</small>
               </div>
             </div>
 

diff --git a/templates/volume/resize.html b/templates/volume/resize.html
@@ -17,7 +17,7 @@ <h4>Resize Volume {{ .Volume.Path }}</h4>
             <div class="form-group row">
               <div class="col-md-12">
                 <label>New Volume Size (megabytes)</label>
-                <input value="{{ .Volume.Size }}" required="required" class="form-control" name="Size" id="Name">
+                <input value="{{ .Volume.SizeMb }}" required="required" class="form-control" name="Size" id="Name">
                 <small id="nameHelp" class="form-text text-muted">Volume size can only be increased, current size is {{ .Volume.Size }}M</small>
               </div>
             </div>