Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provisioning form: "logical_cpus" is called "cpu_total_cores". #2914

Merged
merged 1 commit into from
Dec 4, 2017
Merged

Provisioning form: "logical_cpus" is called "cpu_total_cores". #2914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controllers/application_controller/miq_request_methods.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ def build_vm_grid(vms, sort_order = nil, sort_by = nil, filter_by = nil)
"name" => _("Name"),
"operating_system.product_name" => _("Operating System"),
"platform" => _("Platform"),
"logical_cpus" => _("CPUs"),
"cpu_total_cores" => _("CPUs"),
"mem_cpu" => _("Memory"),
"allocated_disk_storage" => _("Disk Size"),
"deprecated" => _("Deprecated"),
Expand All @@ -415,7 +415,7 @@ def build_vm_grid(vms, sort_order = nil, sort_by = nil, filter_by = nil)
# currently the only ones that support the field.
headers["image?"] = _("Type") if vms.any? { |vm| vm.respond_to?(:image?) }

integer_fields = %w(allocated_disk_storage mem_cpu logical_cpus v_total_snapshots)
integer_fields = %w(allocated_disk_storage mem_cpu cpu_total_cores v_total_snapshots)

filtered_vms = vms.select { |x| filter_by.call(x) }

Expand Down
2 changes: 1 addition & 1 deletion app/views/miq_request/_pre_prov.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
%tr
- id = @edit[:req_id] || "new"
- ["name", "image?", "operating_system.product_name", "platform",
"logical_cpus", "mem_cpu", "allocated_disk_storage", "deprecated",
"cpu_total_cores", "mem_cpu", "allocated_disk_storage", "deprecated",
"ext_management_system.name", "v_total_snapshots", "cloud_tenant"].each do |column_name|
- if @edit[:vm_headers].include?(column_name)
%th
Expand Down