14438 fix merge

This commit is contained in:
Arthur 2024-02-08 10:32:39 -08:00
parent 0bd15c30ec
commit 0c214d37b3

View File

@ -44,12 +44,11 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% with jobs=module.get_latest_jobs %} {% for script in module.scripts.all %}
{% for script_name, script in module.scripts.items %} {% with last_job=script.get_latest_jobs|get_key:script.name %}
{% with last_job=jobs|get_key:script.class_name %}
<tr> <tr>
<td> <td>
<a href="{% url 'extras:script' module=module.python_name name=script.class_name %}" id="{{ script.module }}.{{ script.class_name }}">{{ script.name }}</a> <a href="{% url 'extras:script' script.pk %}" id="{{ script.module }}.{{ script.class_name }}">{{ script.name }}</a>
</td> </td>
<td>{{ script.description|markdown|placeholder }}</td> <td>{{ script.description|markdown|placeholder }}</td>
{% if last_job %} {% if last_job %}
@ -66,7 +65,7 @@
<td> <td>
{% if perms.extras.run_script %} {% if perms.extras.run_script %}
<div class="float-end d-print-none"> <div class="float-end d-print-none">
<form action="{% url 'extras:script' module=script.module name=script.class_name %}" method="post"> <form action="{% url 'extras:script' script.pk %}" method="post">
{% csrf_token %} {% csrf_token %}
<button type="submit" name="_run" class="btn btn-primary btn-sm"> <button type="submit" name="_run" class="btn btn-primary btn-sm">
{% if last_job %} {% if last_job %}
@ -112,7 +111,6 @@
{% endif %} {% endif %}
{% endwith %} {% endwith %}
{% endfor %} {% endfor %}
{% endwith %}
</tbody> </tbody>
</table> </table>
{% else %} {% else %}