remove html preview mode
This commit is contained in:
parent
f10bacfa16
commit
581f0ca353
|
@ -121,16 +121,14 @@ class AppWeb(object):
|
||||||
# raise cherrypy.HTTPRedirect('feed', 302)
|
# raise cherrypy.HTTPRedirect('feed', 302)
|
||||||
|
|
||||||
@cherrypy.expose
|
@cherrypy.expose
|
||||||
def puppet(self, fqdn, preview=False):
|
def puppet(self, fqdn):
|
||||||
with self.nodes.db.transaction() as c:
|
with self.nodes.db.transaction() as c:
|
||||||
node = c.root.nodes[fqdn]
|
node = c.root.nodes[fqdn]
|
||||||
doc = {"environment": "production",
|
doc = {"environment": "production",
|
||||||
"classes": {cls.name: yaml.load(conf) or {} for cls, conf in recurse_classes(node).items()},
|
"classes": {cls.name: yaml.load(conf) or {} for cls, conf in recurse_classes(node).items()},
|
||||||
"parameters": recurse_params(node)}
|
"parameters": recurse_params(node)}
|
||||||
if preview:
|
cherrypy.response.headers["Content-type"] = "text/plain"
|
||||||
yield "<plaintext>"
|
return "---\n" + yamldump(doc)
|
||||||
yield "---\n"
|
|
||||||
yield yamldump(doc)
|
|
||||||
|
|
||||||
@cherrypy.expose
|
@cherrypy.expose
|
||||||
def login(self):
|
def login(self):
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
</form>-->
|
</form>-->
|
||||||
<a href="/node_edit?node={{ node.fqdn }}"><button class="secondary-button pure-button">Edit</button></a>
|
<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="/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 %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block body %}
|
{% block body %}
|
||||||
|
|
Loading…
Reference in New Issue