NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-15 11:42:52 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
Jeremy Stretch 2024-10-30 13:10:47 -04:00
commit 19c5c32965
8 changed files with 101 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/views.py
View File

@ -11,7 +11,7 @@ from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse from django.urls import reverse
from django.utils.html import escape from django.utils.html import escape
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import gettext as _ from django.utils.translation import gettext_lazy as _
from django.views.generic import View from django.views.generic import View
from jinja2.exceptions import TemplateError from jinja2.exceptions import TemplateError

3
netbox/extras/views.py
View File

@ -1180,7 +1180,8 @@ class ScriptView(BaseScriptView):
data=form.cleaned_data, data=form.cleaned_data,
request=copy_safe_request(request), request=copy_safe_request(request),
job_timeout=script.python_class.job_timeout, job_timeout=script.python_class.job_timeout,
commit=form.cleaned_data.pop('_commit') commit=form.cleaned_data.pop('_commit'),
name=script.name
) )
return redirect('extras:script_result', job_pk=job.pk) return redirect('extras:script_result', job_pk=job.pk)

2
netbox/ipam/views.py
View File

@ -3,7 +3,7 @@ from django.db.models import Prefetch
from django.db.models.expressions import RawSQL from django.db.models.expressions import RawSQL
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse from django.urls import reverse
from django.utils.translation import gettext as _ from django.utils.translation import gettext_lazy as _
from circuits.models import Provider from circuits.models import Provider
from dcim.filtersets import InterfaceFilterSet from dcim.filtersets import InterfaceFilterSet

2
netbox/netbox/views/generic/feature_views.py
View File

@ -4,7 +4,7 @@ from django.contrib import messages
from django.db import transaction from django.db import transaction
from django.db.models import Q from django.db.models import Q
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.utils.translation import gettext as _ from django.utils.translation import gettext_lazy as _
from django.views.generic import View from django.views.generic import View
from core.models import Job, ObjectChange from core.models import Job, ObjectChange

183
netbox/templates/extras/script_list.html
View File

@ -37,101 +37,104 @@
{% endif %} {% endif %}
</div> </div>
</h2> </h2>
{% if module.scripts %} {% with scripts=module.scripts.all %}
<table class="table table-hover scripts"> {% if scripts %}
<thead> <table class="table table-hover scripts">
<tr> <thead>
<th>{% trans "Name" %}</th> <tr>
<th>{% trans "Description" %}</th> <th>{% trans "Name" %}</th>
<th>{% trans "Last Run" %}</th> <th>{% trans "Description" %}</th>
<th>{% trans "Status" %}</th> <th>{% trans "Last Run" %}</th>
<th></th> <th>{% trans "Status" %}</th>
</tr> <th></th>
</thead> </tr>
<tbody> </thead>
{% for script in module.scripts.all %} <tbody>
{% with last_job=script.get_latest_jobs|first %} {% for script in scripts %}
<tr> {% with last_job=script.get_latest_jobs|first %}
<td> <tr>
{% if script.is_executable %} <td>
<a href="{% url 'extras:script' script.pk %}" id="{{ script.module }}.{{ script.class_name }}">{{ script.python_class.name }}</a> {% if script.is_executable %}
<a href="{% url 'extras:script' script.pk %}" id="{{ script.module }}.{{ script.class_name }}">{{ script.python_class.name }}</a>
{% else %}
<a href="{% url 'extras:script_jobs' script.pk %}" id="{{ script.module }}.{{ script.class_name }}">{{ script.python_class.name }}</a>
<span class="text-danger">
<i class="mdi mdi-alert" title="{% trans "Script is no longer present in the source file" %}"></i>
</span>
{% endif %}
</td>
<td>{{ script.python_class.Meta.description|markdown|placeholder }}</td>
{% if last_job %}
<td>
<a href="{% url 'extras:script_result' job_pk=last_job.pk %}">{{ last_job.created|isodatetime }}</a>
</td>
<td>
{% badge last_job.get_status_display last_job.get_status_color %}
</td>
{% else %} {% else %}
<a href="{% url 'extras:script_jobs' script.pk %}" id="{{ script.module }}.{{ script.class_name }}">{{ script.python_class.name }}</a> <td class="text-muted">{% trans "Never" %}</td>
<span class="text-danger"> <td>{{ ''|placeholder }}</td>
<i class="mdi mdi-alert" title="{% trans "Script is no longer present in the source file" %}"></i>
</span>
{% endif %} {% endif %}
</td> <td>
<td>{{ script.python_class.Meta.description|markdown|placeholder }}</td> {% if request.user|can_run:script and script.is_executable %}
<div class="float-end d-print-none">
<form action="{% url 'extras:script' script.pk %}" method="post">
{% csrf_token %}
<button type="submit" name="_run" class="btn btn-primary btn-sm">
{% if last_job %}
<i class="mdi mdi-replay"></i> {% trans "Run Again" %}
{% else %}
<i class="mdi mdi-play"></i> {% trans "Run Script" %}
{% endif %}
</button>
</form>
</div>
{% endif %}
</td>
</tr>
{% if last_job %} {% if last_job %}
<td> {% for test_name, data in last_job.data.tests.items %}
<a href="{% url 'extras:script_result' job_pk=last_job.pk %}">{{ last_job.created|isodatetime }}</a> <tr>
</td> <td colspan="4" class="method">
<td> <span class="ps-3">{{ test_name }}</span>
{% badge last_job.get_status_display last_job.get_status_color %} </td>
</td> <td class="text-end text-nowrap script-stats">
{% else %} <span class="badge text-bg-success">{{ data.success }}</span>
<td class="text-muted">{% trans "Never" %}</td> <span class="badge text-bg-info">{{ data.info }}</span>
<td>{{ ''|placeholder }}</td> <span class="badge text-bg-warning">{{ data.warning }}</span>
<span class="badge text-bg-danger">{{ data.failure }}</span>
</td>
</tr>
{% endfor %}
{% elif not last_job.data.log %}
{# legacy #}
{% for method, stats in last_job.data.items %}
<tr>
<td colspan="4" class="method">
<span class="ps-3">{{ method }}</span>
</td>
<td class="text-end text-nowrap report-stats">
<span class="badge bg-success">{{ stats.success }}</span>
<span class="badge bg-info">{{ stats.info }}</span>
<span class="badge bg-warning">{{ stats.warning }}</span>
<span class="badge bg-danger">{{ stats.failure }}</span>
</td>
</tr>
{% endfor %}
{% endif %} {% endif %}
<td> {% endwith %}
{% if request.user|can_run:script and script.is_executable %} {% endfor %}
<div class="float-end d-print-none"> </tbody>
<form action="{% url 'extras:script' script.pk %}" method="post"> </table>
{% csrf_token %} {% else %}
<button type="submit" name="_run" class="btn btn-primary btn-sm"> <div class="card-body">
{% if last_job %} <div class="alert alert-warning" role="alert">
<i class="mdi mdi-replay"></i> {% trans "Run Again" %} <i class="mdi mdi-alert"></i>
{% else %} {% blocktrans with module=module.name %}Could not load scripts from module {{ module }}{% endblocktrans %}
<i class="mdi mdi-play"></i> {% trans "Run Script" %} </div>
{% endif %}
</button>
</form>
</div>
{% endif %}
</td>
</tr>
{% if last_job %}
{% for test_name, data in last_job.data.tests.items %}
<tr>
<td colspan="4" class="method">
<span class="ps-3">{{ test_name }}</span>
</td>
<td class="text-end text-nowrap script-stats">
<span class="badge text-bg-success">{{ data.success }}</span>
<span class="badge text-bg-info">{{ data.info }}</span>
<span class="badge text-bg-warning">{{ data.warning }}</span>
<span class="badge text-bg-danger">{{ data.failure }}</span>
</td>
</tr>
{% endfor %}
{% elif not last_job.data.log %}
{# legacy #}
{% for method, stats in last_job.data.items %}
<tr>
<td colspan="4" class="method">
<span class="ps-3">{{ method }}</span>
</td>
<td class="text-end text-nowrap report-stats">
<span class="badge bg-success">{{ stats.success }}</span>
<span class="badge bg-info">{{ stats.info }}</span>
<span class="badge bg-warning">{{ stats.warning }}</span>
<span class="badge bg-danger">{{ stats.failure }}</span>
</td>
</tr>
{% endfor %}
{% endif %}
{% endwith %}
{% endfor %}
</tbody>
</table>
{% else %}
<div class="card-body">
<div class="alert alert-warning" role="alert">
<i class="mdi mdi-alert"></i> Could not load scripts from {{ module.name }}
</div> </div>
</div> {% endif %}
{% endif %} {% endwith %}
</div> </div>
{% empty %} {% empty %}
<div class="alert alert-info" role="alert"> <div class="alert alert-info" role="alert">

2
netbox/tenancy/views.py
View File

@ -1,6 +1,6 @@
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django.utils.translation import gettext as _ from django.utils.translation import gettext_lazy as _
from netbox.views import generic from netbox.views import generic
from utilities.query import count_related from utilities.query import count_related

2
netbox/translations/en/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-28 19:20+0000\n" "POT-Creation-Date: 2024-10-29 21:00+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

2
netbox/virtualization/views.py
View File

@ -6,7 +6,7 @@ from django.db.models import Prefetch, Sum
from django.http import HttpResponse from django.http import HttpResponse
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse from django.urls import reverse
from django.utils.translation import gettext as _ from django.utils.translation import gettext_lazy as _
from django.views.generic.base import RedirectView from django.views.generic.base import RedirectView
from jinja2.exceptions import TemplateError from jinja2.exceptions import TemplateError