Skip to content

Commit 0796fc1

Browse files
authored
Merge pull request #8748 from jeffibm/fix-provisioning-vm
Fix for customized tab returning nil error while vm provisioning
2 parents 2a2d5af + e2908dc commit 0796fc1

File tree

1 file changed

+32
-16
lines changed

1 file changed

+32
-16
lines changed

app/helpers/request_info_helper.rb

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ def prov_vm_data(data)
8383
if data[:vms]
8484
unless clones.include?(edit[:wf].request_type)
8585
rows += [prov_row_item(data[:none_index], none_cells(edit[:vm_headers].length - 1))]
86-
rows += data[:vms].map do |vm|
87-
prov_row_item(vm.id.to_s, prov_vm_grid_cells(vm, edit))
86+
if data[:vms]
87+
rows += data[:vms].map do |vm|
88+
prov_row_item(vm.id.to_s, prov_vm_grid_cells(vm, edit))
89+
end
8890
end
8991
end
9092
else
@@ -98,8 +100,10 @@ def prov_host_data(data)
98100
options = edit || data[:options_data]
99101
headers = prov_grid_host_header(edit, options, data[:type])
100102
rows = [prov_row_item(data[:none_index], none_cells(edit[:host_columns].length - 1))]
101-
rows += data[:hosts].map do |host|
102-
prov_row_item(host.id.to_s, prov_host_grid_cells(host, options))
103+
if data[:hosts]
104+
rows += data[:hosts].map do |host|
105+
prov_row_item(host.id.to_s, prov_host_grid_cells(host, options))
106+
end
103107
end
104108
{:headers => headers, :rows => rows, :selected => :placement_host_name, :none_index => data[:none_index]}
105109
end
@@ -108,8 +112,10 @@ def prov_pxe_img_data(data)
108112
edit = data[:edit]
109113
headers, count = prov_grid_header(edit, data[:type])
110114
rows = [prov_row_item(data[:none_index], none_cells(count))]
111-
rows += data[:pxe_img].map do |pxe_img|
112-
prov_row_item(pxe_img.id.to_s, prov_pxe_img_cells(pxe_img))
115+
if data[:pxe_img]
116+
rows += data[:pxe_img].map do |pxe_img|
117+
prov_row_item(pxe_img.id.to_s, prov_pxe_img_cells(pxe_img))
118+
end
113119
end
114120
{:headers => headers, :rows => rows, :selected => :pxe_image_id, :none_index => data[:none_index]}
115121
end
@@ -118,8 +124,10 @@ def prov_iso_img_data(data)
118124
edit = data[:edit]
119125
headers, count = prov_grid_header(edit, data[:type])
120126
rows = [prov_row_item(data[:none_index], none_cells(count))]
121-
rows += data[:iso_img].map do |iso|
122-
prov_row_item(iso.id.to_s, prov_iso_img_cells(iso))
127+
if data[:iso_img]
128+
rows += data[:iso_img].map do |iso|
129+
prov_row_item(iso.id.to_s, prov_iso_img_cells(iso))
130+
end
123131
end
124132
{:headers => headers, :rows => rows, :selected => :iso_image_id, :none_index => data[:none_index]}
125133
end
@@ -128,8 +136,10 @@ def prov_ds_data(data)
128136
edit = data[:edit]
129137
headers, count = prov_grid_header(edit, data[:type])
130138
rows = [prov_row_item(data[:none_index], none_cells(count))]
131-
rows += data[:datastores].map do |ds|
132-
prov_row_item(ds.id.to_s, prov_ds_grid_cells(ds, edit))
139+
if data[:datastores]
140+
rows += data[:datastores].map do |ds|
141+
prov_row_item(ds.id.to_s, prov_ds_grid_cells(ds, edit))
142+
end
133143
end
134144
selected_key = %w[miq_template service_template vm].include?(edit[:org_controller]) ? :placement_ds_name : :attached_ds
135145
{:headers => headers, :rows => rows, :selected => selected_key, :none_index => data[:none_index]}
@@ -139,8 +149,10 @@ def prov_template_data(data)
139149
edit = data[:edit]
140150
headers, count = prov_grid_header(edit, data[:type])
141151
rows = [prov_row_item(data[:none_index], none_cells(count))]
142-
rows += data[:templates].map do |template|
143-
prov_row_item(template.id.to_s, prov_template_cells(template))
152+
if data[:template]
153+
rows += data[:templates].map do |template|
154+
prov_row_item(template.id.to_s, prov_template_cells(template))
155+
end
144156
end
145157
{:headers => headers, :rows => rows, :selected => :customization_template_id, :none_index => data[:none_index]}
146158
end
@@ -151,8 +163,10 @@ def prov_vc_data(data)
151163
rows = []
152164
unless data[:spec_required]
153165
rows += [prov_row_item(data[:none_index], none_cells(count))]
154-
rows += data[:vc].map do |vc|
155-
prov_row_item(vc.id.to_s, prov_vc_cells(vc))
166+
if data[:vc]
167+
rows += data[:vc].map do |vc|
168+
prov_row_item(vc.id.to_s, prov_vc_cells(vc))
169+
end
156170
end
157171
end
158172
{:headers => headers, :rows => rows, :selected => :sysprep_custom_spec, :none_index => data[:none_index]}
@@ -162,8 +176,10 @@ def prov_window_image_data(data)
162176
edit = data[:edit]
163177
headers, count = prov_grid_header(edit, data[:type])
164178
rows = [prov_row_item(data[:none_index], none_cells(count))]
165-
rows += data[:window_image].map do |window|
166-
prov_row_item(window.id.to_s, prov_window_image_cells(window))
179+
if data[:window_image]
180+
rows += data[:window_image].map do |window|
181+
prov_row_item(window.id.to_s, prov_window_image_cells(window))
182+
end
167183
end
168184
{:headers => headers, :rows => rows, :selected => :customization_template_id, :none_index => data[:none_index]}
169185
end

0 commit comments

Comments
 (0)