app/models/naf/machine.rb in naf-1.1.4 vs app/models/naf/machine.rb in naf-2.0.0

@@ -242,9 +242,17 @@
                                          :marked_down_by_machine_id,
                                          :marked_down_at
                                         ])
     end
 
+    def hostname
+      if server_name.present?
+        server_name
+      else
+        server_address
+      end
+    end
+
     private
 
     def check_blank_values
       self.short_name = nil if self.short_name.blank?
       self.server_name = nil if self.server_name.blank?