puppet/puppetboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pql'

Browse Source
This commit is contained in:
Raphaël Pinson
2016-06-21 09:46:02 +02:00
parent 4887588662 38986047a6
commit 6a072d1f1b
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
puppetboard/app.py
View File

@@ -723,7 +723,9 @@ def query(env):
form = QueryForm(csrf_enabled=False) form = QueryForm(csrf_enabled=False)
if form.validate_on_submit(): if form.validate_on_submit():
if form.query.data[0] == '[': if form.endpoints.data == 'pql':
query = form.query.data
elif form.query.data[0] == '[':
query = form.query.data query = form.query.data
else: else:
query = '[{0}]'.format(form.query.data) query = '[{0}]'.format(form.query.data)

1
puppetboard/forms.py
View File

@@ -25,6 +25,7 @@ class QueryForm(Form):
('catalogs', 'Catalogs'), ('catalogs', 'Catalogs'),
('edges', 'Edges'), ('edges', 'Edges'),
('environments', 'Environments'), ('environments', 'Environments'),
('pql', 'PQL'),
]) ])
rawjson = BooleanField('Raw JSON') rawjson = BooleanField('Raw JSON')

2
requirements.txt
View File

@@ -5,5 +5,5 @@ MarkupSafe==0.19
WTForms==1.0.5 WTForms==1.0.5
Werkzeug==0.9.4 Werkzeug==0.9.4
itsdangerous==0.23 itsdangerous==0.23
pypuppetdb==0.2.1 pypuppetdb==0.3.1
requests==2.6.0 requests==2.6.0