fixes #3683 display free and available space in vSphere datastore selection #1039
Conversation
|
[test] |
| @@ -1,5 +1,5 @@ | |||
| <div class="fields"> | |||
| <%= selectable_f f, :datastore, compute_resource.datastores, { }, :class => "span2", :label => _("Data Store"), :disabled => !new %> | |||
| <%= select_f f, :datastore, compute_resource.datastores, :name, :to_label, { }, :class => "span2", :label => _("Data Store"), :disabled => !new %> | |||
| <%= text_f f, :name, :class => "input-mini", :label => "Name", :disabled => !new %> | |||
There was a problem hiding this comment.
Why not move the ds_ext to a simple helper? this way you dont need to extend any core object?
There was a problem hiding this comment.
|
I have submitted a fog pull request: fog/fog#2402 |
|
Update: fog as accepted my pull request and will support the "uncommitted" attribute from the next version. |
|
I don't think we need to reimplement the human size bit on Integer here, as Rails already has a |
| extend ActiveSupport::Concern | ||
| def to_label | ||
| if freespace and capacity | ||
| "#{name} (#{freespace.to_human_size} / #{capacity.to_human_size})" |
There was a problem hiding this comment.
not sure if it's just me, but I read number / larger number as used / total rather than free / total...
|
I have updated the diff, now everything is implemented in _volume.html.erb |
| { }, | ||
| :class => "span2", | ||
| :label => _("Data Store"), | ||
| :disabled => !new %> |
There was a problem hiding this comment.
I don't think this is needed since f9a7731
Use span4 instead of span2
| <%= selectable_f f, :datastore, compute_resource.datastores, { }, :class => "span2 disable-unsupported", :label => _("Data Store") %> | ||
| <%= selectable_f f, :datastore, | ||
| compute_resource.datastores.map { | ||
| |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] |
No description provided.