From 2ce18b34e3dc19a58e008b2c3576ae990e15ed6b Mon Sep 17 00:00:00 2001
From: Richard Jones <richard@cottagelabs.com>
Date: Wed, 3 Apr 2024 12:37:00 +0100
Subject: [PATCH 1/3] open journal link in a new window

---
 portality/templates/application_form/editorial_form_body.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/portality/templates/application_form/editorial_form_body.html b/portality/templates/application_form/editorial_form_body.html
index cb2db9256..9750c1cef 100644
--- a/portality/templates/application_form/editorial_form_body.html
+++ b/portality/templates/application_form/editorial_form_body.html
@@ -5,8 +5,7 @@
 {% import "application_form/_application_warning_msg.html" as _msg %}
 {% if obj and (obj.es_type == 'journal' and obj.is_in_doaj()) %}
     {{ _msg.build_journal_withdrawn_deleted_msg(obj) }}
-    <a class="button button--tertiary" href="{{ url_for('doaj.toc', identifier=obj.id) }}">See this
-        journal in DOAJ</a>
+    <a class="button button--tertiary" href="{{ url_for('doaj.toc', identifier=obj.id) }}" target="_blank">See this journal in DOAJ</a>
 {% endif %}
 
 

From 504aafe322b220fea0c2a01bb50b6f6b57a7ff5f Mon Sep 17 00:00:00 2001
From: Richard Jones <richard@cottagelabs.com>
Date: Wed, 3 Apr 2024 13:02:38 +0100
Subject: [PATCH 2/3] don't add unnecessary space if no dir present

---
 portality/static/js/doaj.fieldrender.edges.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/portality/static/js/doaj.fieldrender.edges.js b/portality/static/js/doaj.fieldrender.edges.js
index b82822cfb..dc3138e4f 100644
--- a/portality/static/js/doaj.fieldrender.edges.js
+++ b/portality/static/js/doaj.fieldrender.edges.js
@@ -3506,7 +3506,9 @@ $.extend(true, doaj, {
                         if (dir === undefined) {
                             dir = "";
                         }
-                        dir = " " + dir;
+                        if (dir !== "") {
+                            dir = " " + dir;
+                        }
                         sortOptions += '<option value="' + field + '' + dir + '">' + edges.escapeHtml(display) + '</option>';
                     }
 

From 62bdb4f00405b0de36d1f4194ce315727a170a26 Mon Sep 17 00:00:00 2001
From: Steven Eardley <steve@eardley.xyz>
Date: Tue, 9 Apr 2024 14:43:34 +0100
Subject: [PATCH 3/3] Version bump for JS changes

---
 portality/settings.py | 2 +-
 setup.py              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/portality/settings.py b/portality/settings.py
index efed04b9d..a4446a6a9 100644
--- a/portality/settings.py
+++ b/portality/settings.py
@@ -9,7 +9,7 @@
 # Application Version information
 # ~~->API:Feature~~
 
-DOAJ_VERSION = "6.6.8"
+DOAJ_VERSION = "6.6.9"
 API_VERSION = "3.0.1"
 
 ######################################
diff --git a/setup.py b/setup.py
index eccafbada..7e6c1d38b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='doaj',
-    version='6.6.8',
+    version='6.6.9',
     packages=find_packages(),
     install_requires=[
         "awscli==1.20.50",