Merge pull request #352 from CDLUC3/develop

EZID 3.0.10rc2
CDLUC3 · Oct 27, 2022 · 6a2868e · 6a2868e
2 parents a102f21 + 91fd10e
commit 6a2868e
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/impl/nog/shoulder.py b/impl/nog/shoulder.py
@@ -116,13 +116,17 @@ def create_shoulder(
     log.debug('Minter BerkeleyDB created at: {}'.format(bdb_path.as_posix()))
     # Add new shoulder row to the shoulder table.
     try:
+        minterVal = "ezid:/{}".format(
+                '/'.join(bdb_path.parts[-3:-1]),
+            )
+        if (is_super_shoulder):
+            minterVal = ''
+
         ezidapp.models.shoulder.Shoulder.objects.create(
             prefix=ns,
             type=ns.scheme.upper(),
             name=organization_name_str,
-            minter="ezid:/{}".format(
-                '/'.join(bdb_path.parts[-3:-1]),
-            ),
+            minter=minterVal,
             datacenter=datacenter_model,
             crossrefEnabled=is_crossref,
             isTest=is_test,

diff --git a/impl/ui_demo.py b/impl/ui_demo.py
@@ -27,6 +27,7 @@ def simple(request):
 # noinspection PyDictCreation
 def advanced(request):
     d = {'menu_item': 'ui_home.learn'}
+    d["testPrefixes"] = django.conf.settings.TEST_SHOULDER_DICT
     d['prefixes'] = sorted(
         django.conf.settings.TEST_SHOULDER_DICT, key=lambda p: p['namespace'].lower()
     )  # must be done before calling form processing

diff --git a/settings/settings.py.j2 b/settings/settings.py.j2
@@ -512,7 +512,7 @@ LINKCHECKER_USER_AGENT = 'EZID (EZID link checker; https://ezid.cdlib.org/)'
 # link. Set to a negative value to make unlimited.
 LINKCHECKER_MAX_READ = 104_857_600
 # EZID Link checker e-mails
-LINK_CHECKER_ADMIN = '{{ link_checker_admin }}'
+LINK_CHECKER_ADMIN = {{ link_checker_admin }}
 
 # Internal settings
 

diff --git a/tests/test_docs/sample/test_shoulder_create_ark_flags.sample b/tests/test_docs/sample/test_shoulder_create_ark_flags.sample
@@ -12,7 +12,7 @@ at [MEMORY-ADDRESS]>,
   'isTest': True,
   'isUuid': False,
   'manager': 'ezid',
-  'minter': 'ezid:/91101/r01',
+  'minter': '',
   'name': '91101/r01 test org',
   'prefix': 'ark:/91101/r01/',
   'prefix_shares_datacenter': False,

diff --git a/tests/test_docs/sample/test_shoulder_create_doi_datacite_flags.sample b/tests/test_docs/sample/test_shoulder_create_doi_datacite_flags.sample
@@ -12,7 +12,7 @@ at [MEMORY-ADDRESS]>,
   'isTest': True,
   'isUuid': False,
   'manager': 'ezid',
-  'minter': 'ezid:/b9111/r01',
+  'minter': '',
   'name': '91101/r01 test org',
   'prefix': 'doi:10.9111/R01/',
   'prefix_shares_datacenter': True,

diff --git a/tests/test_shoulder_create_ark.py b/tests/test_shoulder_create_ark.py
@@ -90,11 +90,9 @@ def test_1030(self, caplog, tmp_bdb_root):
             '--skip-checks',
             '--test',
         )
-        ezid_uri = "ezid:/99920/NULL"
+        ezid_uri = ''
         assert ezidapp.models.shoulder.Shoulder.objects.filter(prefix=ns_str).exists()
-        s = ezidapp.models.shoulder.Shoulder.objects.filter(minter=ezid_uri).get()
-        sample.assert_match(tests.util.util.shoulder_to_dict(s), 'NULL')
-        assert s.minter == ezid_uri
+        s = ezidapp.models.shoulder.Shoulder.objects.filter(prefix=ns_str).get()
         assert s.name == org_str
         assert s.active
         assert s.isSupershoulder

diff --git a/tools/link_check_emailer.py b/tools/link_check_emailer.py
@@ -1,4 +1,5 @@
 #! /usr/bin/env python
+# -*- coding: utf-8 -*-
 
 #  Copyright©2021, Regents of the University of California
 #  http://creativecommons.org/licenses/BSD

diff --git a/tools/link_check_summary_report.py b/tools/link_check_summary_report.py
@@ -1,4 +1,5 @@
 #! /usr/bin/env python
+# -*- coding: utf-8 -*-
 
 #  Copyright©2021, Regents of the University of California
 #  http://creativecommons.org/licenses/BSD