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

Jump to bottom

AssetDetails should be AssetDetail #3264

Merged
merged 1 commit into from
Feb 16, 2018
Merged

AssetDetails should be AssetDetail #3264

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
12 changes: 6 additions & 6 deletions app/helpers/physical_server_helper/textual_summary.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,27 +136,27 @@ def textual_loc_led_state
end

def textual_support_contact
{:label => _("Support contact"), :value => @record.asset_details['contact']}
{:label => _("Support contact"), :value => @record.asset_detail['contact']}
end

def textual_description
{:label => _("Description"), :value => @record.asset_details['description']}
{:label => _("Description"), :value => @record.asset_detail['description']}
end

def textual_location
{:label => _("Location"), :value => @record.asset_details['location']}
{:label => _("Location"), :value => @record.asset_detail['location']}
end

def textual_room_id
{:label => _("Room"), :value => @record.asset_details['room_id']}
{:label => _("Room"), :value => @record.asset_detail['room_id']}
end

def textual_rack_name
{:label => _("Rack name"), :value => @record.asset_details['rack_name']}
{:label => _("Rack name"), :value => @record.asset_detail['rack_name']}
end

def textual_lowest_rack_unit
{:label => _("Lowest rack name"), :value => @record.asset_details['lowest_rack_unit']}
{:label => _("Lowest rack name"), :value => @record.asset_detail['lowest_rack_unit']}
end

def textual_health_state
Expand Down
4 changes: 2 additions & 2 deletions spec/controllers/physical_server_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
EvmSpecHelper.create_guid_miq_server_zone
login_as FactoryGirl.create(:user)
ems = FactoryGirl.create(:ems_physical_infra)
asset_details = FactoryGirl.create(:asset_details)
asset_detail = FactoryGirl.create(:asset_detail)
computer_system = FactoryGirl.create(:computer_system, :hardware => FactoryGirl.create(:hardware))
@physical_server = FactoryGirl.create(:physical_server,
:asset_details => asset_details,
:asset_detail => asset_detail,
:computer_system => computer_system,
:ems_id => ems.id,
:id => 1)
Expand Down