\
@@ -2897,11 +2899,20 @@ $.extend(true, doaj, {
Read online '
if (this.widget){
frag += '
'
- }
- else {
+ } else {
frag += ''
}
frag += '\
+ \
+ \
+ Export Citation (RIS) '
+ if (this.widget){
+ frag += '
'
+ } else {
+ frag += ''
+ }
+ frag += '\
+ \
\
About the journal\
\
diff --git a/portality/static/js/formulaic.js b/portality/static/js/formulaic.js
index 0c5932c3ce..494dd747fb 100644
--- a/portality/static/js/formulaic.js
+++ b/portality/static/js/formulaic.js
@@ -1155,14 +1155,14 @@ var formulaic = {
this._renderAutocheck = function(autocheck) {
let frag = "";
-
+
if (autocheck.checked_by && doaj.autocheckers &&
doaj.autocheckers.registry.hasOwnProperty(autocheck.checked_by)) {
frag += (new doaj.autocheckers.registry[autocheck.checked_by]()).draw(autocheck)
} else {
frag += this._defaultRender(autocheck);
}
-
+
frag += ` `;
return frag;
}
@@ -2252,5 +2252,36 @@ var formulaic = {
this.init();
},
+
+ newArticleInfo : (params) => edges.instantiate(formulaic.widgets.ArticleInfo, params),
+ ArticleInfo: function ({formulaic, fieldDef, args}) {
+ const $sealEle = $('label[for=doaj_seal-0]');
+
+ if (!$sealEle.length) {
+ console.log('skip ArticleInfo, seal section not found')
+ return;
+ }
+
+ const idResult = window.location.pathname.match('/journal/([a-f0-9]+)')
+ if (!idResult) {
+ console.log('skip ArticleInfo, journal id not found')
+ return
+ }
+ const journalId = idResult[1]
+ fetch(`/admin/journal/${journalId}/article-info`)
+ .then(response => response.json())
+ .then(data => {
+ let articleText = `(This journal has ${data.n_articles} articles in DOAJ)`
+ if (data.n_articles > 0) {
+ const articlesUrl = `/admin/journal/${journalId}/article-info/admin-site-search`
+ articleText = `${articleText}`
+ }
+ $sealEle.html($sealEle.text() + ` ${articleText}`)
+ })
+ },
+
+
+
+
}
};
diff --git a/portality/tasks/journal_bulk_edit.py b/portality/tasks/journal_bulk_edit.py
index 3e39d4388e..0b4242adbc 100644
--- a/portality/tasks/journal_bulk_edit.py
+++ b/portality/tasks/journal_bulk_edit.py
@@ -123,8 +123,8 @@ def run(self):
job.add_audit_message("Setting {f} to {x} for journal {y}".format(f=k, x=v, y=journal_id))
fc.form[k].data = v
else:
- if v:
- fc.form.doaj_seal.data = v
+ if v or (isinstance(v, str) and v.lower() == 'y'):
+ fc.form.doaj_seal.data = ['y']
updated = True
if note:
diff --git a/portality/templates-v2/management/_application-form/includes/_editorial_form_fields.html b/portality/templates-v2/management/_application-form/includes/_editorial_form_fields.html
index ba8f74cab6..e567690934 100644
--- a/portality/templates-v2/management/_application-form/includes/_editorial_form_fields.html
+++ b/portality/templates-v2/management/_application-form/includes/_editorial_form_fields.html
@@ -56,7 +56,6 @@
{% include "management/includes/_todo.html" %}
{% set groups = managed_groups %}
diff --git a/portality/templates-v2/management/includes/_todo.html b/portality/templates-v2/management/includes/_todo.html
index 14d29431b2..7e552bfa23 100644
--- a/portality/templates-v2/management/includes/_todo.html
+++ b/portality/templates-v2/management/includes/_todo.html
@@ -41,6 +41,11 @@
"feather": "edit",
"show_status": true
},
+ constants.TODO_MANED_ON_HOLD: {
+ "text" : "On Hold Application Review status",
+ "colour" : "var(--sanguine)",
+ "feather": "x-circle"
+ },
constants.TODO_EDITOR_STALLED: {
"text" : "Stalled Chase Associate Editor",
"show_status": true,
diff --git a/portality/ui/messages.py b/portality/ui/messages.py
index 5702b45aa4..1487a2ca7e 100644
--- a/portality/ui/messages.py
+++ b/portality/ui/messages.py
@@ -29,8 +29,6 @@ class Messages(object):
SENT_JOURNAL_CONTACT_ACCEPTED_UPDATE_REQUEST_EMAIL = """Sent email to journal contact '{email}' to tell that an update to their journal was accepted."""
SENT_JOURNAL_CONTACT_IN_PROGRESS_EMAIL = """An email has been sent to the Journal Contact alerting them that you are working on their application."""
SENT_JOURNAL_CONTACT_ASSIGNED_EMAIL = """An email has been sent to the Journal Contact alerting them that an editor has been assigned to their application."""
- SENT_PUBLISHER_IN_PROGRESS_EMAIL = """An email has been sent to the Owner alerting them that you are working on their application."""
- SENT_PUBLISHER_ASSIGNED_EMAIL = """A notification has been sent to the Owner alerting them that an editor has been assigned to their application."""
NOT_SENT_ACCEPTED_APPLICATION_EMAIL = """Did not send notification to '{user}' to tell them that their journal was accepted. Email may be disabled, or there is a problem with the email address."""
NOT_SENT_REJECTED_APPLICATION_EMAILS = """Did not send email to user '{user}' or application suggester to tell them that their journal was rejected Email may be disabled, or there is a problem with the email address."""
@@ -40,8 +38,6 @@ class Messages(object):
NOT_SENT_JOURNAL_CONTACT_ACCEPTED_APPLICATION_EMAIL = """Did not send email to '{email}' to tell them that their application/update request was accepted. Email may be disabled, or there is a problem with the email address"""
NOT_SENT_JOURNAL_CONTACT_IN_PROGRESS_EMAIL = """An email could not be sent to the Journal Contact alerting them that you are working on their application. Email may be disabled, or there is a problem with the email address"""
NOT_SENT_JOURNAL_CONTACT_ASSIGNED_EMAIL = """An email could not be sent to the Journal Contact alerting them that an editor has been assigned to their application. Email may be disabled, or there is a problem with the email address"""
- NOT_SENT_PUBLISHER_IN_PROGRESS_EMAIL = """An email could not be sent to the Owner alerting them that you are working on their application. Email may be disabled, or there is a problem with the email address. """
- NOT_SENT_PUBLISHER_ASSIGNED_EMAIL = """An email could not be sent to the Owner alerting them that an editor has been assigned to their application. Email may be disabled, or there is a problem with the email address"""
IN_PROGRESS_NOT_SENT_EMAIL_DISABLED = """Did not send email to Owner or Journal Contact about the status change, as publisher emails are disabled."""
diff --git a/portality/view/admin.py b/portality/view/admin.py
index 088c4513fc..cdddbb69a9 100644
--- a/portality/view/admin.py
+++ b/portality/view/admin.py
@@ -7,13 +7,14 @@
from flask_login import current_user, login_required
from werkzeug.datastructures import MultiDict
-from portality import dao
import portality.models as models
from portality import constants
+from portality import dao
from portality import lock
from portality.background import BackgroundSummary
from portality.bll import DOAJ, exceptions
from portality.bll.exceptions import ArticleMergeConflict, DuplicateArticleException
+from portality.bll.services.query import Query
from portality.core import app
from portality.crosswalks.application_form import ApplicationFormXWalk
from portality.decorators import ssl_required, restrict_to_role, write_required
@@ -29,8 +30,6 @@
from portality.ui import templates
from portality.util import flash_with_url, jsonp, make_json_resp, get_web_json_payload, validate_json
from portality.view.forms import EditorGroupForm, MakeContinuation
-
-from portality.bll.services.query import Query
from portality.view.view_helper import exparam_editing_user
# ~~Admin:Blueprint~~
@@ -335,6 +334,31 @@ def journals_bulk_reinstate():
#
#####################################################################
+@blueprint.route("/journal/'
- }
- else {
+ } else {
frag += ''
}
frag += '\
+ '
+ } else {
+ frag += ''
+ }
+ frag += '\
+ {{ fs.label }}
{% set fs = formulaic_context.fieldset("seal") %} {% if fs %}{{ fs.label }}
-The journal may have fulfilled all the criteria for the Seal.
{% for f in fs.fields() %} {% set field_template = f.template %} {% include field_template %} diff --git a/portality/templates-v2/management/admin/dashboard.html b/portality/templates-v2/management/admin/dashboard.html index 25edc07b8d..414b95daf4 100644 --- a/portality/templates-v2/management/admin/dashboard.html +++ b/portality/templates-v2/management/admin/dashboard.html @@ -28,6 +28,12 @@ {% else %} Update Requests {% endif %} + + {% if request.values.get("filter") == "oh" %} + On Hold + {% else %} + On Hold + {% endif %}