Merge remote-tracking branch 'origin/develop' into feature/3672_autoc…

…heck_none_value

cms/data/ambassadors.yml

@@ -65,8 +65,8 @@
 
 - name: Mahmoud Khalifa
   region: Middle East and Persian Gulf
-  bio: "Mahmoud is the founder of Cybrarians, the Arabic Portal for Librarianship and Information, a non-profit organization located in Egypt since 2002, and working on serving library and information community in Arab countries. He is PhD candidate in Humboldt University of Berlin, Germany. He works on a dissertation about The national information policies. Mahmoud was an Associate at IFLA International Leaders Programme, 2016-2018, and an accredited trainer for the IFLA BSLA programme (Building Strong Library Association), as well as an OCLC Fellow at Jay Jordan IFLA/OCLC Early Career Development Fellowship Program, class 2010. In 2013 he was the winner of the Scientific Research Academy’s prize in informatics in Egypt. Professionally, he worked in Library of Congress Cairo Office from 2006-2018."
-  photo: "mahmoud.jpg"
+  bio: "Mahmoud is a PhD candidate at Humboldt University of Berlin, Germany. He is writing his dissertation about national information policies. Mahmoud was an associate at the IFLA International Leaders Programme, 2016-2018, and an accredited trainer for the IFLA BSLA programme (Building Strong Library Association), as well as an OCLC Fellow at Jay Jordan IFLA/OCLC Early Career Development Fellowship Program, class 2010. Professionally, he worked in the Library of Congress Cairo Office from 2006-2018. As a researcher, he published more than 20 articles, book chapters, and conference papers."
+  photo: "mahmoud-new.jpg"
   coi:
     2022: https://drive.google.com/file/d/10s7B0WeTPqpaafhThv-i8q03uIFaAAue/view?usp=sharing
 

cms/data/notifications.yml

@@ -40,15 +40,15 @@ application:publisher:accepted:notify:
   long: |
     Congratulations! The application submitted for **{application_title}** on {application_date} has been accepted for inclusion in DOAJ.
 
-    You may access the journal record from your Publisher dashboard: [{publisher_dashboard_url}]({publisher_dashboard_url}) using your DOAJ username and password.
+    You may access the journal record from your Publisher dashboard: [{publisher_dashboard_url}]({publisher_dashboard_url}) using your DOAJ account ID or email address, and password.
 
-    If there are changes or updates to the information about your journal at any time after it has been accepted, please submit an Update Request from your Publisher dashboard promptly. Please be aware that failure to do this may result in removal of your journal from DOAJ.
+    If there are changes or updates to the information about your journal at any time after it has been accepted, please [submit an Update Request](https://doaj.org/publisher/journal) from your Publisher dashboard promptly. Failure to do this promptly may result in the withdrawal of your journal from DOAJ.
 
-    How to submit an Update Request: [{faq_url}#how-do-i-update-the-information-about-my-journal]({faq_url}#how-do-i-update-the-information-about-my-journal)
+    [How to submit an Update Request](https://doaj.org/apply/publisher-responsibilities/#keeping-your-journal-records-up-to-date)
 
     To increase the visibility, impact, distribution and usage of your journal content, we encourage you to upload article metadata for this journal to DOAJ as soon as possible.
 
-    How to upload article metadata: [{faq_url}#how-do-i-upload-article-metadata]({faq_url}#how-do-i-upload-article-metadata)
+    [How to upload article metadata](https://doaj.org/docs/faq/#uploading-article-metadata)
 
     We are delighted to welcome this journal into DOAJ. Do not hesitate to contact us at [helpdesk@doaj.org](mailto:helpdesk@doaj.org) if you have any questions.
   short:

cms/data/volunteers.yml

@@ -40,6 +40,7 @@ ed:
   city: Surabaya
   country: Indonesia
   language: Indonesian, English
+  photo: "Ratodi.jpg"
 
 - name: Natalia Pamuła-Cieślak
   area: Humanities, Social Sciences
@@ -380,6 +381,7 @@ ass_ed:
   city: Valencia
   country: Spain
   language: Spanish, English
+  photo: "Margalejo.jpeg"
 
 - name: Jamila Jaber
   area: Library and Information Science
@@ -423,13 +425,6 @@ ass_ed:
   country:
   language: Korean, English
 
-- name: José Darío Martínez Ezquerro
-  area: Medicine
-  year_since:
-  city:
-  country: Mexico
-  language: Spanish, English
-
 - name: Juliana Soares Lima
   area: Librarianship and information science
   year_since:
@@ -565,6 +560,14 @@ ass_ed:
   country:
   language: Spanish, English
 
+- name: Martyna Mirecka
+  area: History, Political Science
+  year_since:
+  city: Łupice
+  country: Poland
+  language: Polish, English
+  photo: "Mirecka.jpeg"
+
 - name: Melih Sever
   area: Social Sciences
   year_since:
@@ -656,6 +659,7 @@ ass_ed:
   city: Donostia
   country: Spain
   language: Euskera, Spanish, English
+  photo: "Agirre.JPG"
 
 - name: Paula Carina de Araújo
   area: Library and Information Science
@@ -753,6 +757,14 @@ ass_ed:
   language: French
   photo: "sogoba1.jpg"
 
+- name: Susana Costa
+  area: Library and Information Sciences
+  year_since:
+  city: Braga
+  country: Portugal
+  language: Portuguese, English
+  photo: "Costa.jpeg"
+
 - name: Swasti Maharani
   area: Mathematics
   year_since:

cms/pages/apply/transparency.md

@@ -171,7 +171,7 @@ Any direct marketing activities, including solicitation of manuscripts, that are
 
 ## Version history
 
-- This is Version 4.0 of the Principles of Transparency and Best Practice in Scholarly Publishing
+- This is Version 4.0 - September 2022
 - [Version 3.0](https://docs.google.com/document/d/1wtnA5zj02Hn3XY_SUWvs3U22DC9MaaNVrdiCHYXlrGE/edit?usp=sharing) - January 2018
 - [Version 2.0](https://oaspa.org/principles-of-transparency-and-best-practice-in-scholarly-publishing-2/?highlight=principles) - June 2015 (on the OASPA website)
 - [Version 1.0](https://oaspa.org/principles-of-transparency-and-best-practice-in-scholarly-publishing/?highlight=principles) - December 2013 (on the OASPA website)

cms/pages/docs/faq.md

@@ -10,10 +10,10 @@ featuremap: ~~FAQ:Fragment~~
 
 After your journal is indexed in DOAJ and you start to upload article metadata to us, we generate journal and article metadata. We make these publicly and freely available via different methods:
 
-- Our [Atom feed](https://staticdoaj.cottagelabs.com/feed)
-- Our [OAI-PMH service](https://staticdoaj.cottagelabs.com/docs/oai-pmh/)
-- [A journal CSV](https://staticdoaj.cottagelabs.com/csv) file (updates every 60 minutes)
-- Our [API](https://staticdoaj.cottagelabs.com/docs/api/)
+- Our [Atom feed](https://doaj.org/feed)
+- Our [OAI-PMH service](https://doaj.org/docs/oai-pmh/)
+- [A journal CSV](https://doaj.org/csv) file (updates every 60 minutes)
+- Our [API](https://doaj.org/docs/api/)
 - On our website
 
 Our metadata is collected and incorporated into commercial discovery systems, library discovery portals and search engines around the world. Here are some of them:

cms/sass/layout/_editorial-panel.scss

@@ -16,8 +16,14 @@
     position: sticky;
     top: 100px;
 
+    &__wrapper {
+      display: flex;
+      flex-direction: column;
+      max-height: calc(100vh - 75px - 1.5rem - 25px); //(full viewport)-(nav height)-(top padding)-(bottom padding)
+    }
+
     &__content {
-      max-height: 70vh;
+      flex: 1;
       overflow-y: scroll;
 
       select, textarea, input {

doajtest/README.md

@@ -33,6 +33,12 @@ Following are the guide to write unit test for parallelised:
 
 ----------------------------------------
 
+## Combinatrix and paramaterised tests
+
+Find the test matrices here: https://drive.google.com/drive/folders/1EFKBbBCay983wzSUgD6F3Bj_V8c5ix54
+
+TODO, full guide...
+
 ## Testbook
 
 See: Testbook section from ../docs/README.md

doajtest/fixtures/urls.py

@@ -4,15 +4,20 @@
     "https://www.cosmos.com#galaxy",
     "https://www.cosmos.com/galaxy",
     "https://www.cosmos.com/galaxy#peanut",
-    "http://ftp.example.com/file%20name.txt"
+    "http://ftp.example.com/file%20name.txt",
+    "https://revistalogos.policia.edu.co:8443/index.php/rlct/about",
+    "https://revistalogos.policia.edu.co:65535/index.php/rlct/about",
+    "https://revistalogos.policia.edu.co:0/index.php/rlct/about"
 ]
 
 INVALID_URL_LISTS = [
     "ht:www",
     "nonexistent.com",
     "https://www.doaj.org and https://www.reddit.com",
     "http://www.doaj.org and www.doaj.org",
-"http://www.doaj.org, www.doaj.org",
-"http://www.doaj.org, https://www.doaj.org",
-"http://ftp.example.com/file name.txt"
-]
+    "http://www.doaj.org, www.doaj.org",
+    "http://www.doaj.org, https://www.doaj.org",
+    "http://ftp.example.com/file name.txt",
+    "https://revistalogos.policia.edu.co:65536/index.php/rlct/about",
+    "https://revistalogos.policia.edu.co:655350/index.php/rlct/about"
+]

doajtest/matrices/bll_todo_maned/top_todo_maned.matrix.csv

@@ -1,6 +1,6 @@
-test_id,account,raises,todo_maned_stalled,todo_maned_follow_up_old,todo_maned_ready,todo_maned_completed,todo_maned_assign_pending,todo_maned_ready_order,todo_maned_follow_up_old_order,todo_maned_stalled_order,todo_maned_assign_pending_order,todo_maned_completed_order
-1,none,ArgumentException,0,0,0,0,0,,,,,
-2,no_role,,0,0,0,0,0,,,,,
-3,admin,,1,1,1,1,1,1,2,3,4,5
-4,editor,,0,0,0,0,0,,,,,
-5,assed,,0,0,0,0,0,,,,,
+test_id,account,raises,todo_maned_stalled,todo_maned_follow_up_old,todo_maned_ready,todo_maned_completed,todo_maned_assign_pending,todo_maned_new_update_request,todo_maned_new_update_request_order,todo_maned_ready_order,todo_maned_follow_up_old_order,todo_maned_stalled_order,todo_maned_assign_pending_order,todo_maned_completed_order
+1,none,ArgumentException,0,0,0,0,0,0,,,,,,
+2,no_role,,0,0,0,0,0,0,,,,,,
+3,admin,,1,1,1,1,1,1,1,2,3,4,5,6
+4,editor,,0,0,0,0,0,0,,,,,,
+5,assed,,0,0,0,0,0,0,,,,,,

doajtest/matrices/bll_todo_maned/top_todo_maned.settings.csv

@@ -1,32 +1,36 @@
-field,test_id,account,raises,todo_maned_stalled,todo_maned_follow_up_old,todo_maned_ready,todo_maned_completed,todo_maned_assign_pending,todo_maned_ready_order,todo_maned_follow_up_old_order,todo_maned_stalled_order,todo_maned_assign_pending_order,todo_maned_completed_order
-type,index,generated,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional
-default,,,,,,,,,,,,,
-,,,,,,,,,,,,,
-values,,none,ArgumentException,,,,,,,,,,
-values,,no_role,,,,,,,,,,,
-values,,admin,,,,,,,,,,,
-values,,editor,,,,,,,,,,,
-values,,assed,,,,,,,,,,,
-,,,,,,,,,,,,,
-conditional raises,,none,ArgumentException,,,,,,,,,,
-,,,,,,,,,,,,,
-conditional todo_maned_stalled,,admin,,1,,,,,,,,,
-conditional todo_maned_stalled,,!admin,,0,,,,,,,,,
-,,,,,,,,,,,,,
-conditional todo_maned_follow_up_old,,admin,,,1,,,,,,,,
-conditional todo_maned_follow_up_old,,!admin,,,0,,,,,,,,
-,,,,,,,,,,,,,
-conditional todo_maned_ready,,admin,,,,1,,,,,,,
-conditional todo_maned_ready,,!admin,,,,0,,,,,,,
-,,,,,,,,,,,,,
-conditional todo_maned_completed,,admin,,,,,1,,,,,,
-conditional todo_maned_completed,,!admin,,,,,0,,,,,,
-,,,,,,,,,,,,,
-conditional todo_maned_assign_pending,,admin,,,,,,1,,,,,
-conditional todo_maned_assign_pending,,!admin,,,,,,0,,,,,
-,,,,,,,,,,,,,
-conditional todo_maned_ready_order,,admin,,,,,,,1,,,,
-conditional todo_maned_follow_up_old_order,,admin,,,,,,,,2,,,
-conditional todo_maned_stalled_order,,admin,,,,,,,,,3,,
-conditional todo_maned_assign_pending_order,,admin,,,,,,,,,,4,
-conditional todo_maned_completed_order,,admin,,,,,,,,,,,5
+field,test_id,account,raises,todo_maned_stalled,todo_maned_follow_up_old,todo_maned_ready,todo_maned_completed,todo_maned_assign_pending,todo_maned_new_update_request,todo_maned_new_update_request_order,todo_maned_ready_order,todo_maned_follow_up_old_order,todo_maned_stalled_order,todo_maned_assign_pending_order,todo_maned_completed_order
+type,index,generated,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional
+default,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,
+values,,none,ArgumentException,,,,,,,,,,,,
+values,,no_role,,,,,,,,,,,,,
+values,,admin,,,,,,,,,,,,,
+values,,editor,,,,,,,,,,,,,
+values,,assed,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,
+conditional raises,,none,ArgumentException,,,,,,,,,,,,
+,,,,,,,,,,,,,,,
+conditional todo_maned_stalled,,admin,,1,,,,,,,,,,,
+conditional todo_maned_stalled,,!admin,,0,,,,,,,,,,,
+,,,,,,,,,,,,,,,
+conditional todo_maned_follow_up_old,,admin,,,1,,,,,,,,,,
+conditional todo_maned_follow_up_old,,!admin,,,0,,,,,,,,,,
+,,,,,,,,,,,,,,,
+conditional todo_maned_ready,,admin,,,,1,,,,,,,,,
+conditional todo_maned_ready,,!admin,,,,0,,,,,,,,,
+,,,,,,,,,,,,,,,
+conditional todo_maned_completed,,admin,,,,,1,,,,,,,,
+conditional todo_maned_completed,,!admin,,,,,0,,,,,,,,
+,,,,,,,,,,,,,,,
+conditional todo_maned_assign_pending,,admin,,,,,,1,,,,,,,
+conditional todo_maned_assign_pending,,!admin,,,,,,0,,,,,,,
+,,,,,,,,,,,,,,,
+conditional todo_maned_new_update_request,,admin,,,,,,,1,,,,,,
+conditional todo_maned_new_update_request,,!admin,,,,,,,0,,,,,,
+,,,,,,,,,,,,,,,
+conditional todo_maned_new_update_request_order,,admin,,,,,,,,1,,,,,
+conditional todo_maned_ready_order,,admin,,,,,,,,,2,,,,
+conditional todo_maned_follow_up_old_order,,admin,,,,,,,,,,3,,,
+conditional todo_maned_stalled_order,,admin,,,,,,,,,,,4,,
+conditional todo_maned_assign_pending_order,,admin,,,,,,,,,,,,5,
+conditional todo_maned_completed_order,,admin,,,,,,,,,,,,,6

doajtest/matrices/bll_todo_maned/top_todo_maned.settings.json

@@ -179,7 +179,7 @@
       }
     },
     {
-      "name": "todo_maned_ready_order",
+      "name": "todo_maned_new_update_request",
       "type": "conditional",
       "default": "",
       "values": {
@@ -193,11 +193,40 @@
               }
             }
           ]
+        },
+        "0": {
+          "conditions": [
+            {
+              "account": {
+                "nor": [
+                  "admin"
+                ]
+              }
+            }
+          ]
         }
       }
     },
     {
-      "name": "todo_maned_follow_up_old_order",
+      "name": "todo_maned_new_update_request_order",
+      "type": "conditional",
+      "default": "",
+      "values": {
+        "1": {
+          "conditions": [
+            {
+              "account": {
+                "or": [
+                  "admin"
+                ]
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "name": "todo_maned_ready_order",
       "type": "conditional",
       "default": "",
       "values": {
@@ -215,7 +244,7 @@
       }
     },
     {
-      "name": "todo_maned_stalled_order",
+      "name": "todo_maned_follow_up_old_order",
       "type": "conditional",
       "default": "",
       "values": {
@@ -233,7 +262,7 @@
       }
     },
     {
-      "name": "todo_maned_assign_pending_order",
+      "name": "todo_maned_stalled_order",
       "type": "conditional",
       "default": "",
       "values": {
@@ -251,7 +280,7 @@
       }
     },
     {
-      "name": "todo_maned_completed_order",
+      "name": "todo_maned_assign_pending_order",
       "type": "conditional",
       "default": "",
       "values": {
@@ -267,6 +296,24 @@
           ]
         }
       }
+    },
+    {
+      "name": "todo_maned_completed_order",
+      "type": "conditional",
+      "default": "",
+      "values": {
+        "6": {
+          "conditions": [
+            {
+              "account": {
+                "or": [
+                  "admin"
+                ]
+              }
+            }
+          ]
+        }
+      }
     }
   ]
 }