NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-09 00:58:16 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

8984 review changes

Browse Source
This commit is contained in:
Arthur Hanson 2024-06-20 11:23:42 -07:00
parent 253a4cf11e
commit db838e01e9
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
netbox/extras/views.py
View File

@ -1193,8 +1193,8 @@ class ScriptResultView(TableMixin, generic.ObjectView):
index = 0 index = 0
log_level = LOG_LEVEL_RANK.get(request.GET.get('log_level', LogLevelChoices.LOG_DEFAULT)) log_level = LOG_LEVEL_RANK.get(request.GET.get('log_level', LogLevelChoices.LOG_DEFAULT))
if job.data: if job.data:
if 'log' in job.data: if 'log' in job.data:
if 'tests' in job.data: if 'tests' in job.data:
tests = job.data['tests'] tests = job.data['tests']
@ -1221,17 +1221,19 @@ class ScriptResultView(TableMixin, generic.ObjectView):
for method, test_data in tests.items(): for method, test_data in tests.items():
if 'log' in test_data: if 'log' in test_data:
for time, status, obj, url, message in test_data['log']: for time, status, obj, url, message in test_data['log']:
index += 1 check_level = LOG_LEVEL_RANK.get(status, LogLevelChoices.LOG_DEFAULT)
result = { if check_level >= log_level:
'index': index, index += 1
'method': method, result = {
'time': time, 'index': index,
'status': status, 'method': method,
'object': obj, 'time': time,
'url': url, 'status': status,
'message': message, 'object': obj,
} 'url': url,
data.append(result) 'message': message,
}
data.append(result)
table = ReportResultsTable(data, user=request.user) table = ReportResultsTable(data, user=request.user)
table.configure(request) table.configure(request)
@ -1249,6 +1251,7 @@ class ScriptResultView(TableMixin, generic.ObjectView):
'script': job.object, 'script': job.object,
'job': job, 'job': job,
'table': table, 'table': table,
'log_level': request.GET.get('log_level', None)
} }
if job.data and 'log' in job.data: if job.data and 'log' in job.data:

8
netbox/templates/extras/script_result.html
View File

@ -45,6 +45,13 @@
<div class="row mb-3"> <div class="row mb-3">
<div class="col-2 d-print-none"> <div class="col-2 d-print-none">
{% if log_level %}
<div class="mb-3">
<a href="{% url 'extras:script_result' job_pk=job.pk %}" class="badge rounded-pill text-bg-primary text-decoration-none me-1">
<i class="mdi mdi-close"></i> {{ log_level }}
</a>
</div>
{% endif %}
<div class="dropdown"> <div class="dropdown">
<button class="btn btn-outline-secondary dropdown-toggle" type="button" id="dropdownLogLevelButton" data-bs-toggle="dropdown" aria-expanded="false"> <button class="btn btn-outline-secondary dropdown-toggle" type="button" id="dropdownLogLevelButton" data-bs-toggle="dropdown" aria-expanded="false">
{% trans "Show Log Level" %} {% trans "Show Log Level" %}
@ -52,6 +59,7 @@
<ul class="dropdown-menu" aria-labelledby="dropdownLogLevelButton"> <ul class="dropdown-menu" aria-labelledby="dropdownLogLevelButton">
<li><a class="dropdown-item" href="{% url 'extras:script_result' job_pk=job.pk %}">{% trans "All" %}</a></li> <li><a class="dropdown-item" href="{% url 'extras:script_result' job_pk=job.pk %}">{% trans "All" %}</a></li>
<li><a class="dropdown-item" href="{% url 'extras:script_result' job_pk=job.pk %}?log_level=debug">{% trans "Debug" %}</a></li> <li><a class="dropdown-item" href="{% url 'extras:script_result' job_pk=job.pk %}?log_level=debug">{% trans "Debug" %}</a></li>
<li><a class="dropdown-item" href="{% url 'extras:script_result' job_pk=job.pk %}?log_level=success">{% trans "Success" %}</a></li>
<li><a class="dropdown-item" href="{% url 'extras:script_result' job_pk=job.pk %}?log_level=info">{% trans "Info" %}</a></li> <li><a class="dropdown-item" href="{% url 'extras:script_result' job_pk=job.pk %}?log_level=info">{% trans "Info" %}</a></li>
<li><a class="dropdown-item" href="{% url 'extras:script_result' job_pk=job.pk %}?log_level=warning">{% trans "Warning" %}</a></li> <li><a class="dropdown-item" href="{% url 'extras:script_result' job_pk=job.pk %}?log_level=warning">{% trans "Warning" %}</a></li>
<li><a class="dropdown-item" href="{% url 'extras:script_result' job_pk=job.pk %}?log_level=failure">{% trans "Failure" %}</a></li> <li><a class="dropdown-item" href="{% url 'extras:script_result' job_pk=job.pk %}?log_level=failure">{% trans "Failure" %}</a></li>