fixes #3683 - display free and available space in vSphere datastore s…

…election
theforeman · Nov 22, 2013 · 5257110 · 5257110
1 parent 611fd58
commit 5257110
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/app/helpers/compute_resources_vms_helper.rb b/app/helpers/compute_resources_vms_helper.rb
@@ -56,6 +56,17 @@ def libvirt_networks(compute)
     select
   end
 
+  def vsphere_datastores(compute)
+    compute.datastores.map do |ds|
+      [
+        ds.freespace && ds.capacity ?
+          "#{ds.name} (#{_('free')}: #{number_to_human_size(ds.freespace)}, #{_('total')}: #{number_to_human_size(ds.capacity)})" :
+          ds.name,
+        ds.name
+      ]
+    end
+  end
+
   def available_actions(vm)
     case vm
     when Fog::Compute::OpenStack::Server

diff --git a/app/views/compute_resources_vms/form/vmware/_volume.html.erb b/app/views/compute_resources_vms/form/vmware/_volume.html.erb
@@ -1,5 +1,5 @@
 <div class="fields">
-  <%= selectable_f f, :datastore, compute_resource.datastores, { }, :class => "span2 disable-unsupported", :label => _("Data Store") %>
+  <%= selectable_f f, :datastore, vsphere_datastores(compute_resource), { }, :class => "span4 disable-unsupported", :label => _("Data Store") %>
   <%= text_f f, :name, :class => "input-mini disable-unsupported", :label => "Name" %>
   <%= text_f f, :size_gb,
              :class       => "input-mini disable-unsupported",