Gracefully handle nodes of a type for which we don't have a template.

Before, it would simply return a 500 Internal Server Error.
2016-08-30 15:52:55 +02:00
parent 3f9d519753
commit 4529d0597b
3 changed files with 77 additions and 8 deletions
--- a/pillar/web/nodes/routes.py
+++ b/pillar/web/nodes/routes.py
@@ -212,13 +212,23 @@ def view(node_id):
    #                 template_path, node_type_name)
    #     raise NotFound("Missing template '{0}'".format(template_path))

-    return render_template(template_path,
-                           node_id=node._id,
-                           node=node,
-                           parent=node.parent,
-                           children=children,
-                           config=current_app.config,
-                           api=api)
+    try:
+        return render_template(template_path,
+                               node_id=node._id,
+                               node=node,
+                               parent=node.parent,
+                               children=children,
+                               config=current_app.config,
+                               api=api)
+    except TemplateNotFound:
+        log.error('Template %s does not exist for node type %s', template_path, node_type_name)
+        return render_template('nodes/error_type_not_found.html',
+                               node_id=node._id,
+                               node=node,
+                               parent=node.parent,
+                               children=children,
+                               config=current_app.config,
+                               api=api)


 def _view_handler_asset(node, template_path, template_action, link_allowed):