Skip to content
Snippets Groups Projects
Commit 4a9f80d8 authored by HeJ's avatar HeJ
Browse files

Merge branch '38C3-HUB-2Z' into 'develop'

fix(schedulesource): only link to assembly, when not whildcard import

See merge request hub/hub!1121
parents 3b49a692 2b5988b1
Branches
Tags
No related merge requests found
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
{% block content %} {% block content %}
<h1> <h1>
ScheduleSource on "<span title="{{ object.assembly.name }}">{{ object.assembly.slug }}</span>" ScheduleSource
{% if object.assembly %}on "<span title="{{ object.assembly.name }}">{{ object.assembly.slug }}</span>"{% endif %}
</h1> </h1>
<div class="card mb-3"> <div class="card mb-3">
...@@ -20,7 +22,11 @@ ...@@ -20,7 +22,11 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<p> <p>
{% if object.assembly %}
Assembly: <strong><a href="{% url 'backoffice:assembly-edit' pk=object.assembly.id %}">{{ object.assembly|default:"<em>WILDCARD</em>" }}</a></strong> Assembly: <strong><a href="{% url 'backoffice:assembly-edit' pk=object.assembly.id %}">{{ object.assembly|default:"<em>WILDCARD</em>" }}</a></strong>
{% else %}
<em>WILDCARD</em>
{% endif %}
</p> </p>
<p> <p>
Type: <strong>{{ object.import_type }}</strong> Type: <strong>{{ object.import_type }}</strong>
...@@ -35,7 +41,7 @@ ...@@ -35,7 +41,7 @@
Timeout: <strong>{{ object.import_timeout|naturaltimespan }}</strong> Timeout: <strong>{{ object.import_timeout|naturaltimespan }}</strong>
</p> </p>
<p> <p>
Last Import: <strong>{{ object.last_import|naturaltime|default:"(never)" }}</strong> Version: <strong>{{ object.last_import_version }}</strong> Last completed import: <strong>{{ object.last_import|naturaltime|default:"(never)" }}</strong> Version: <strong>{{ object.last_import_version }}</strong>
</p> </p>
<p> <p>
Configuration: Configuration:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment