From 581f0ca3535859f387d0fc55ca0523d0a813322f Mon Sep 17 00:00:00 2001 From: dave Date: Tue, 7 May 2019 19:44:45 -0700 Subject: [PATCH] remove html preview mode --- nodepupper/daemon.py | 8 +++----- templates/node.html | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/nodepupper/daemon.py b/nodepupper/daemon.py index 1d2feca..58aeb32 100644 --- a/nodepupper/daemon.py +++ b/nodepupper/daemon.py @@ -121,16 +121,14 @@ class AppWeb(object): # raise cherrypy.HTTPRedirect('feed', 302) @cherrypy.expose - def puppet(self, fqdn, preview=False): + def puppet(self, fqdn): with self.nodes.db.transaction() as c: node = c.root.nodes[fqdn] doc = {"environment": "production", "classes": {cls.name: yaml.load(conf) or {} for cls, conf in recurse_classes(node).items()}, "parameters": recurse_params(node)} - if preview: - yield "" - yield "---\n" - yield yamldump(doc) + cherrypy.response.headers["Content-type"] = "text/plain" + return "---\n" + yamldump(doc) @cherrypy.expose def login(self): diff --git a/templates/node.html b/templates/node.html index 5bfb6f8..2a087ec 100644 --- a/templates/node.html +++ b/templates/node.html @@ -10,7 +10,7 @@ </form>--> <a href="/node_edit?node={{ node.fqdn }}"><button class="secondary-button pure-button">Edit</button></a> <a href="/node/{{ node.fqdn }}/attach"><button class="secondary-button pure-button">Attach class</button></a> - <a href="/puppet?preview=true&fqdn={{ node.fqdn }}"><button class="secondary-button pure-button">Render</button></a> + <a href="/puppet?fqdn={{ node.fqdn }}"><button class="secondary-button pure-button">Render</button></a> {% endblock %} {% block body %}