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

error fix, format string and css button width fix

Browse Source
This commit is contained in:
Julius Härtl
2013-11-20 13:34:13 +01:00
parent 08bad89041
commit 73e26e8c1c
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
puppetboard/app.py
View File

@@ -205,13 +205,13 @@ def report_latest(node_name):
""" """
node = get_or_abort(puppetdb.node, node_name) node = get_or_abort(puppetdb.node, node_name)
reports = get_or_abort(puppetdb._query, 'reports', reports = get_or_abort(puppetdb._query, 'reports',
query='["=","certname","' + node_name + '"]', query='["=","certname","{0}"]'.format(node_name),
limit=1) limit=1)
if len(reports) > 0: if len(reports) > 0:
report = reports[0]['hash'] report = reports[0]['hash']
return redirect(url_for('report', node=node_name, report_id=report)) return redirect(url_for('report', node=node_name, report_id=report))
else: else:
abort(500) abort(404)
@app.route('/report/<node>/<report_id>') @app.route('/report/<node>/<report_id>')

3
puppetboard/static/css/puppetboard.css
View File

@@ -99,3 +99,6 @@ div[id^='message-event'] {
background-color: rgb(231, 76, 60); background-color: rgb(231, 76, 60);
background-color: rgb(129, 145, 146); background-color: rgb(129, 145, 146);
} }
.btn-lastreport {
width:100px;
}

4
puppetboard/templates/index.html
View File

@@ -80,9 +80,9 @@
<td><a href="{{url_for('node', node_name=node.name)}}">{{ node.name }}</a></td> <td><a href="{{url_for('node', node_name=node.name)}}">{{ node.name }}</a></td>
<td> <td>
{% if node.unreported_time != None or node.status != 'unreported' %} {% if node.unreported_time != None or node.status != 'unreported' %}
<a class="btn btn-small btn-primary" href="{{url_for('report_latest', node_name=node.name)}}">Latest Report</a> <a class="btn btn-small btn-primary btn-lastreport" href="{{url_for('report_latest', node_name=node.name)}}">Latest Report</a>
{% else %} {% else %}
<a class="btn btn-small"> No Report </a> <a class="btn btn-small btn-lastreport"> No Report </a>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>