Merge pull request #3264 from bdunne/asset_detailsssssssssss

AssetDetails should be AssetDetail
ManageIQ · Feb 16, 2018 · b1df969 · b1df969
2 parents edb68e7 + 683a816
commit b1df969
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/app/helpers/physical_server_helper/textual_summary.rb b/app/helpers/physical_server_helper/textual_summary.rb
@@ -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

diff --git a/spec/controllers/physical_server_controller_spec.rb b/spec/controllers/physical_server_controller_spec.rb
@@ -9,10 +9,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)