From 930d4c6448263ee6ec5681b8c2f7fc3eef6c7254 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Fri, 17 May 2024 09:16:05 -0700
Subject: [PATCH 1/4] 16050 Show script python_class name and description

---
 netbox/templates/extras/script/base.html | 4 ++--
 netbox/templates/extras/script_list.html | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/netbox/templates/extras/script/base.html b/netbox/templates/extras/script/base.html
index 7220b329dbe..37575312dbe 100644
--- a/netbox/templates/extras/script/base.html
+++ b/netbox/templates/extras/script/base.html
@@ -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 }}
@@ -17,7 +17,7 @@
 
 {% block subtitle %}
   <div class="text-secondary fs-5">
-    {{ script.Meta.description|markdown }}
+    {{ script.python_class.description|markdown }}
   </div>
 {% endblock subtitle %}
 
diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html
index 7ce5ca6ebd7..23240ea3081 100644
--- a/netbox/templates/extras/script_list.html
+++ b/netbox/templates/extras/script_list.html
@@ -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>

From f0783c49992e4f7c91f37f3e03c5c7ea09aa961d Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Fri, 24 May 2024 08:44:08 -0700
Subject: [PATCH 2/4] 16050 change to use Meta.description

---
 netbox/templates/extras/script/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/templates/extras/script/base.html b/netbox/templates/extras/script/base.html
index 37575312dbe..725e4737c3b 100644
--- a/netbox/templates/extras/script/base.html
+++ b/netbox/templates/extras/script/base.html
@@ -17,7 +17,7 @@
 
 {% block subtitle %}
   <div class="text-secondary fs-5">
-    {{ script.python_class.description|markdown }}
+    {{ script.python_class.Meta.description|markdown }}
   </div>
 {% endblock subtitle %}
 

From a0a1a7c0f2d23e466956f79c79c85d9249b1af3c Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Fri, 24 May 2024 08:52:24 -0700
Subject: [PATCH 3/4] 16050 change to use Meta.description

---
 netbox/templates/extras/script_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html
index 23240ea3081..27b6115a7ed 100644
--- a/netbox/templates/extras/script_list.html
+++ b/netbox/templates/extras/script_list.html
@@ -64,7 +64,7 @@ <h5 class="card-header justify-content-between" id="module{{ module.pk }}">
                       </span>
                     {% endif %}
                   </td>
-                  <td>{{ script.python_class.description|markdown|placeholder }}</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>

From dc50a73b22b29a1f405df3237ea17fabd968b37e Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Tue, 4 Jun 2024 07:55:11 -0700
Subject: [PATCH 4/4] 16050 remove module name customization from docs

---
 docs/customization/custom-scripts.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/customization/custom-scripts.md b/docs/customization/custom-scripts.md
index 21ae20f0558..2a8f252aa2c 100644
--- a/docs/customization/custom-scripts.md
+++ b/docs/customization/custom-scripts.md
@@ -65,12 +65,6 @@ class AnotherCustomScript(Script):
 script_order = (MyCustomScript, AnotherCustomScript)
 ```
 
-## Module Attributes
-
-### `name`
-
-You can define `name` within a script module (the Python file which contains one or more scripts) to set the module name. If `name` is not defined, the module's file name will be used.
-
 ## Script Attributes
 
 Script attributes are defined under a class named `Meta` within the script. These are optional, but encouraged.