Skip to content

Commit 1f1344f

Browse files
Fix failing specs
1 parent 5d8cc2b commit 1f1344f

File tree

5 files changed

+0
-44
lines changed

5 files changed

+0
-44
lines changed

app/controllers/vm_common.rb

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -306,15 +306,6 @@ def snap_pressed
306306
formatted_size = _("%{number} bytes") % {:number => number_with_delimiter(@snap_selected[:total_size], :delimiter => ",", :separator => ".")}
307307
end
308308
render :json => {:data => {:data => @snap_selected, :size => formatted_size, :time => formatted_time}}, :status => 200
309-
# render :update do |page|
310-
# page << javascript_prologue
311-
# page << javascript_reload_toolbars
312-
313-
# page.replace("flash_msg_div", :partial => "layouts/flash_msg")
314-
# page << "miqScrollTop();" if @flash_array.present?
315-
# page.replace("desc_content", :partial => "/vm_common/snapshots_desc",
316-
# :locals => {:selected => params[:id]})
317-
# end
318309
end
319310

320311
def disks

app/views/vm_common/_config.html.haml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484

8585
- when "snapshot_info"
8686
= render :partial => "vm_common/snapshots_desc"
87-
= render :partial => "vm_common/snapshots_tree"
8887

8988
- when "vmtree_info"
9089
= render :partial => "vm_common/vmtree"

app/views/vm_common/_snapshots_desc.html.haml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,3 @@
1212
- size = _("%{number} bytes") % {:number => number_with_delimiter(selected_id[:total_size], :delimiter => ",", :separator => ".")}
1313

1414
= react('VmSnapshotTreeSelect', {tree: @snapshot_tree, selected: selected_id, size: size, time: time})
15-
16-
#desc_content.desc_content
17-
- if session[:snap_selected].present? || @record.snapshots.count > 0
18-
.form-horizontal
19-
.form-group
20-
%label.control-label.col-sm-2
21-
= _('Description')
22-
.col-md-10
23-
%p.form-control-static
24-
= selected_id[:description]
25-
.form-group
26-
%label.control-label.col-sm-2
27-
= _('Size')
28-
.col-md-10
29-
- unless selected_id[:total_size].blank?
30-
%p.form-control-static
31-
= number_to_human_size(selected_id[:total_size], :precision => 2)
32-
= _("(%{number} bytes)") % {:number => number_with_delimiter(selected_id[:total_size], :delimiter => ",", :separator => ".")}
33-
.form-group
34-
%label.control-label.col-sm-2
35-
= _('Created On')
36-
.col-md-10
37-
- unless selected_id[:create_time].blank?
38-
%p.form-control-static
39-
= format_timezone(selected_id[:create_time].to_time, Time.zone, "view")
40-
%hr
41-
- else
42-
= render :partial => 'layouts/info_msg', :locals => {:message => _("%{record_name} has no snapshots") % {:record_name => @record.name}}

app/views/vm_common/_snapshots_tree.html.haml

Lines changed: 0 additions & 5 deletions
This file was deleted.

spec/controllers/vm_infra_controller_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
post :show, :params => {:id => vm_vmware.id, :display => 'snapshot_info'}, :xhr => true
9797
expect(response.status).to eq(200)
9898
expect(response).to render_template('vm_common/_snapshots_desc')
99-
expect(response).to render_template('vm_common/_snapshots_tree')
10099
end
101100

102101
it 'can open the right size tab' do

0 commit comments

Comments
 (0)