Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

16050 Show script python_class name and description #16185

Merged
merged 6 commits into from
Jun 6, 2024
Merged

16050 Show script python_class name and description #16185

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
930d4c6
16050 Show script python_class name and description
arthanson May 17, 2024
2a90e66
Merge branch 'develop' into 16050-script-name
arthanson May 24, 2024
f0783c4
16050 change to use Meta.description
arthanson May 24, 2024
a0a1a7c
16050 change to use Meta.description
arthanson May 24, 2024
efee6e7
Merge branch 'develop' into 16050-script-name
arthanson Jun 4, 2024
dc50a73
16050 remove module name customization from docs
arthanson Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions netbox/templates/extras/script/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% load log_levels %}
{% load i18n %}

{% block title %}{{ script }}{% endblock %}
{% block title %}{{ script.python_class.name }}{% endblock %}

{% block object_identifier %}
{{ script.full_name }}
Expand All @@ -17,7 +17,7 @@

{% block subtitle %}
<div class="text-secondary fs-5">
{{ script.Meta.description|markdown }}
{{ script.python_class.description|markdown }}
</div>
{% endblock subtitle %}

Expand Down
6 changes: 3 additions & 3 deletions netbox/templates/extras/script_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ <h5 class="card-header justify-content-between" id="module{{ module.pk }}">
<tr>
<td>
{% if script.is_executable %}
<a href="{% url 'extras:script' script.pk %}" id="{{ script.module }}.{{ script.class_name }}">{{ script.name }}</a>
<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.name }}</a>
<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.description|markdown|placeholder }}</td>
<td>{{ script.python_class.description|markdown|placeholder }}</td>
{% if last_job %}
<td>
<a href="{% url 'extras:script_result' job_pk=last_job.pk %}">{{ last_job.created|isodatetime }}</a>
Expand Down
Loading