From 6098e636c8863d434ed483b1af704db4a75057a9 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 6 Feb 2021 14:55:41 +0000
Subject: [PATCH] .

---
 longs/tables.py                               | 14 +++++++++++++-
 longs/templates/longs/long_detail.html        | 10 ----------
 longs/templates/longs/long_display_block.html |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/longs/tables.py b/longs/tables.py
index f8680380..278bba6c 100755
--- a/longs/tables.py
+++ b/longs/tables.py
@@ -57,6 +57,15 @@ class LongTable(tables.Table):
         fields = ("examination", "created_date", "author")
         sequence = ("view", "series")
 
+class PopupLinkColumn(tables.Column):
+    def render(self, value):
+        return format_html("<span>test: {}<span>", value)
+        obj = value.first()
+
+        if obj is None:
+            return format_html("<span>No image<span>")
+
+        return obj.get_thumbnail()[0]
 
 class LongSeriesTable(tables.Table):
     edit = tables.LinkColumn(
@@ -65,10 +74,13 @@ class LongSeriesTable(tables.Table):
     view = tables.LinkColumn(
         "longs:long_series_detail", text="View", args=[A("pk")], orderable=False
     )
+    popup = PopupLinkColumn(
+        "View in popup", orderable=False
+    )
     images = LongSeriesImageColumn("Images", orderable=False)
 
     class Meta:
         model = Long
         template_name = "django_tables2/bootstrap4.html"
         fields = ("modality", "examination", "long", "description", "author")
-        sequence = ("view", "images")
\ No newline at end of file
+        sequence = ("view", "popup", "images")
\ No newline at end of file
diff --git a/longs/templates/longs/long_detail.html b/longs/templates/longs/long_detail.html
index cd9f9fb7..93581614 100755
--- a/longs/templates/longs/long_detail.html
+++ b/longs/templates/longs/long_detail.html
@@ -26,15 +26,5 @@
 {% endblock %}
 
 {% block js %}
-<!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
-
-<script type="text/javascript">
-
-function popitup(url, title) {
-    newwindow=window.open(url,title,'height=600,width=500');
-    if (window.focus) {newwindow.focus()}
-    return false;
-}
-    </script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/longs/templates/longs/long_display_block.html b/longs/templates/longs/long_display_block.html
index 01961bde..0030720a 100755
--- a/longs/templates/longs/long_display_block.html
+++ b/longs/templates/longs/long_display_block.html
@@ -13,7 +13,7 @@
                 {{series.get_block}}
             </a>
 
-<a href="#" onclick="return popitup('/longs/series/{{series.pk}}', 'Series')"
+<a href="#" onclick="return window.create_popup_window('/longs/series/{{series.pk}}', 'Series')"
     >Popup</a>
         </span>
         {% endfor %}