Merge branch 'master' of https://github.com/salopensource/sal

salopensource · Jun 7, 2017 · f02710a · f02710a
2 parents 1aa8bb4 + 835108f
commit f02710a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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>
 

diff --git a/server/views.py b/server/views.py
@@ -1957,7 +1957,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