Skip to content

Commit

Permalink
Fix multilabel tables for Container entities
Browse files Browse the repository at this point in the history
  • Loading branch information
zakiva committed Mar 21, 2017
1 parent 481b3a0 commit 898ffe3
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 5 deletions.
4 changes: 2 additions & 2 deletions app/helpers/container_group_helper/textual_summary.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def textual_group_conditions
condition.status,
]
end
TextualGroup.new(_("Conditions"), h)
TextualMultilabel.new(_("Conditions"), h)
end

def textual_group_smart_management
Expand Down Expand Up @@ -73,7 +73,7 @@ def textual_group_volumes
volume_values[0][0] = volume.name if volume_values.length > 0
h[:values] += volume_values
end
TextualGroup.new(_("Volumes"), h)
TextualMultilabel.new(_("Volumes"), h)
end

#
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/container_service_helper/textual_summary.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def textual_group_port_configs
config.node_port
]
end
TextualGroup.new(_("Port Configurations"), h)
TextualMultilabel.new(_("Port Configurations"), h)
end

def textual_group_relationships
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/ems_container_helper/textual_summary.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def textual_group_component_statuses
(cs.error || "")
]
end
TextualGroup.new(_("Component Statuses"), h)
TextualMultilabel.new(_("Component Statuses"), h)
end

def textual_group_smart_management
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/persistent_volume_helper/textual_summary.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def textual_group_smart_management

def textual_group_capacity
labels = [_("Resource"), _("Quantity")]
TextualGroup.new(_("Capacity"), :labels => labels, :values => @record.capacity)
TextualMultilabel.new(_("Capacity"), :labels => labels, :values => @record.capacity)
end

#
Expand Down
1 change: 1 addition & 0 deletions spec/controllers/container_build_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
get :show, :params => { :id => container_build.id }
expect(response.status).to eq(200)
expect(response.body).to_not be_empty
expect(response).to render_template('shared/summary/_textual_multilabel')
expect(assigns(:breadcrumbs)).to eq([{:name => "Builds",
:url => "/container_build/show_list?page=&refresh=y"},
{:name => "Test Build (Summary)",
Expand Down
1 change: 1 addition & 0 deletions spec/controllers/container_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@

expect(response).to render_template('layouts/_textual_groups_generic')
expect(response).to render_template('shared/summary/_textual_tags')
expect(response).to render_template('shared/summary/_textual_multilabel')
expect(response.status).to eq(200)
end
end
Expand Down
1 change: 1 addition & 0 deletions spec/controllers/container_group_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
it do
is_expected.to have_http_status 200
is_expected.to render_template(:partial => "layouts/listnav/_container_group")
is_expected.to render_template('shared/summary/_textual_multilabel')
end
end
end
Expand Down
1 change: 1 addition & 0 deletions spec/controllers/container_image_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
it do
is_expected.to have_http_status 200
is_expected.to render_template(:partial => "layouts/listnav/_container_image")
is_expected.to render_template('shared/summary/_textual_multilabel')
end
end
end
Expand Down
1 change: 1 addition & 0 deletions spec/controllers/container_node_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
it do
is_expected.to have_http_status 200
is_expected.to render_template(:partial => "layouts/listnav/_container_node")
is_expected.to render_template('shared/summary/_textual_multilabel')
end
end
end
Expand Down
1 change: 1 addition & 0 deletions spec/controllers/container_project_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
it do
is_expected.to have_http_status 200
is_expected.to render_template(:partial => "layouts/listnav/_container_project")
is_expected.to render_template('shared/summary/_textual_multilabel')
end
end
end
Expand Down
1 change: 1 addition & 0 deletions spec/controllers/container_service_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
it do
is_expected.to have_http_status 200
is_expected.to render_template(:partial => "layouts/listnav/_container_service")
is_expected.to render_template('shared/summary/_textual_multilabel')
end
end
end
Expand Down
1 change: 1 addition & 0 deletions spec/controllers/container_template_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
get :show, :params => { :id => container_template.id }
expect(response.status).to eq(200)
expect(response.body).to_not be_empty
expect(response).to render_template('shared/summary/_textual_multilabel')
expect(assigns(:breadcrumbs)).to eq([{:name => "Container Templates",
:url => "/container_template/show_list?page=&refresh=y"},
{:name => "Test Template (Summary)",
Expand Down
1 change: 1 addition & 0 deletions spec/controllers/persistent_volume_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
is_expected.to have_http_status 200
is_expected.to render_template(:partial => 'layouts/_textual_groups_generic')
is_expected.to render_template(:partial => 'layouts/listnav/_persistent_volume')
is_expected.to render_template('shared/summary/_textual_multilabel')
end
end
end
Expand Down

0 comments on commit 898ffe3

Please sign in to comment.