From df67b2c757e813512a6e5f1ea31f8a4693444013 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 11 Mar 2020 12:32:52 +0100
Subject: Fix: JS table - do not shorten web links

---
 ishtar_common/static/datatables/ellipsis.js | 6 +++++-
 ishtar_common/views_item.py                 | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'ishtar_common')

diff --git a/ishtar_common/static/datatables/ellipsis.js b/ishtar_common/static/datatables/ellipsis.js
index 186e9e56a..562eb701e 100644
--- a/ishtar_common/static/datatables/ellipsis.js
+++ b/ishtar_common/static/datatables/ellipsis.js
@@ -71,8 +71,12 @@ jQuery.fn.dataTable.render.ellipsis = function ( cutoff, wordbreak, escapeHtml )
 		if ( d.length <= cutoff ) {
 			return d;
 		}
+		if (d.substr(0, 2) ==  "<a"){  // do not cut links
+		console.log(d);
+			return d;
+		}
 
-		var shortened = d.substr(0, cutoff-1);
+		var shortened = d.substr(0, cutoff - 1);
 
 		// Find the last white space character in the string
 		if ( wordbreak ) {
diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index ba9a41f3d..8cd903a00 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -663,7 +663,8 @@ def _manage_bool_fields(model, bool_fields, reversed_bool_fields, dct, or_reqs):
                     return
                 c_field = c_field.related_model._meta.get_field(field_name)
             if k.endswith('__isnull') and \
-                    isinstance(c_field, (ImageField, FileField)):
+                    (isinstance(c_field, (ImageField, FileField))
+                     or field_names[-2] == "associated_url"):
                 key = "__".join(k.split('__')[:-1])
                 if dct[k]:
                     or_reqs.append(
@@ -1863,7 +1864,7 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
             "<a class='display_details' href='#' " \
             "onclick='load_window(\"{}\")'>" \
             "<i class=\"fa fa-info-circle\" aria-hidden=\"true\"></i><lock></a>"
-        link_ext_template = '<a href="{}" target="_blank"></a>'
+        link_ext_template = '<a href="{}" target="_blank">{}</a>'
         lock = '&nbsp;<i class="fa fa-lock text-danger" aria-hidden="true"></i>'
         own_lock = '&nbsp;<i class="fa fa-lock text-success" ' \
                    'aria-hidden="true"></i>'
-- 
cgit v1.2.3