\
@@ -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/_application-form/includes/_fieldset_oa_compliance.html b/portality/templates-v2/_application-form/includes/_fieldset_oa_compliance.html
index 932e2b3953..b0170c9bab 100644
--- a/portality/templates-v2/_application-form/includes/_fieldset_oa_compliance.html
+++ b/portality/templates-v2/_application-form/includes/_fieldset_oa_compliance.html
@@ -8,7 +8,7 @@
{% include "management/includes/_todo.html" %}
'
- }
- else {
+ } else {
frag += ''
}
frag += '\
+ '
+ } else {
+ frag += ''
+ }
+ frag += '\
+ - The application form takes approximately 30 minutes to complete.
- Your progress is automatically saved. -
- You can return to this application at any time by clicking My account → Publisher at the top. +
- You can return to this application at any time by clicking Dashboard → Publisher dashboard at the top.
- You can print or download a PDF list of the questions.
- You must apply online.
{{ 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 440d2bda05..b70e51e874 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 %}