Merge branch 'dev' into 'main'

Merge - Release 1.5.1 See merge request django_2023/projects/datanar!45
Gray-Advantage · Dec 29, 2023 · 142d624 · 142d624
2 parents 2782099 + 5ff4b0b
commit 142d624
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/datanar/datanar/settings.py b/datanar/datanar/settings.py
@@ -6,7 +6,7 @@
 
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-VERSION = "1.5.0"
+VERSION = "1.5.1"
 
 SECRET_KEY = config(
     "DJANGO_SECRET_KEY",

diff --git a/datanar/templates/includes/link_card.html b/datanar/templates/includes/link_card.html
@@ -5,14 +5,16 @@
   <div class="flex-grow-1 p-3 d-flex flex-column">
     <div class="d-flex">
       {% include 'svg/link.svg' %}
-      <a href="{% if '/' in link.message %}{{ request.scheme }}://{{ request.get_host }}{{ link }}{% else %}{% url 'redirects:redirect' link %}{% endif %}" target="_blank" class="h5">
-        <strong class="d-block text-truncate link-card">{{ request.get_host }}{% if '/' not in link.message %}/{% endif %}{{ link }}</strong>
+      <a href="{% if '/' in link.message or '/' in link %}{{ request.scheme }}://{{ request.get_host }}{{ link }}{% else %}{% url 'redirects:redirect' link %}{% endif %}" target="_blank" class="h5">
+        <strong class="d-block text-truncate link-card">{{ request.get_host }}{% if '/' not in link.message or '/' not in link %}/{% endif %}{{ link }}</strong>
       </a>
     </div>
     <div class="mt-1">
       <button class="copy-text-field btn btn-outline-dark" data-link="{{ request.scheme }}://{{ request.get_host }}{% if '/' not in link.message %}/{% endif %}{{ link }}">{% trans "copy" %}</button>
-      {% if request.user.is_authenticated and '/' not in link.message %}
-        <a class="btn btn-outline-dark" href="{% url 'statistic:link_detail' link "all_time" %}">{% trans "statistic" %}</a>
+      {% if request.user.is_authenticated %}
+        {% if '/' not in link.message or '/' not in link %}
+          <a class="btn btn-outline-dark" href="{% url 'statistic:link_detail' link "all_time" %}">{% trans "statistic" %}</a>
+        {% endif %}
       {% endif %}
     </div>
   </div>