From 304201448e96ba07d20828b179ec19dda6f8504f Mon Sep 17 00:00:00 2001
From: Chef Austin <austin.culter@gusto.com>
Date: Sat, 20 May 2017 00:37:32 -0600
Subject: [PATCH 1/2] Added hostname to page title for tab-thirsty folks.

---
 server/templates/server/machine_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/templates/server/machine_detail.html b/server/templates/server/machine_detail.html
index 501a70ab..c3763ee1 100644
--- a/server/templates/server/machine_detail.html
+++ b/server/templates/server/machine_detail.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load dashboard_extras %}
-
+{% block title %}Sal - {{ machine.hostname }}{% endblock %}
 {% block script %}
 <script>
 

From d7b73b03ca364bda99d5a1452897a916ba928d53 Mon Sep 17 00:00:00 2001
From: Wade Robson <wade.robson4@gmail.com>
Date: Mon, 5 Jun 2017 14:17:45 -0700
Subject: [PATCH 2/2] Set machine_model_friendly to machine_model if there is
 no internet connection

---
 server/views.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/views.py b/server/views.py
index e1d5c681..2d041608 100644
--- a/server/views.py
+++ b/server/views.py
@@ -1950,7 +1950,10 @@ def checkin(request):
         machine.os_family = report_data['os_family']
 
     if not machine.machine_model_friendly:
-        machine.machine_model_friendly = utils.friendly_machine_model(machine)
+        try:
+            machine.machine_model_friendly = utils.friendly_machine_model(machine)
+        except:
+            machine.machine_model_friendly = machine.machine_model
 
     if deployed_on_checkin is True:
         machine.deployed = True