Fix v0.9.26 hiroba w2026 64 hiroba

modules/cookiecutter-weko-module/{{ cookiecutter.project_shortname }}/babel.ini

@@ -8,7 +8,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/invenio-accounts/babel.ini

@@ -15,7 +15,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/invenio-communities/babel.ini

@@ -31,7 +31,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/invenio-deposit/babel.ini

@@ -31,7 +31,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/invenio-files-rest/babel.ini

@@ -15,7 +15,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/invenio-mail/babel.ini

@@ -27,7 +27,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/invenio-oaiharvester/babel.ini

@@ -27,7 +27,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/invenio-oaiserver/babel.ini

@@ -15,7 +15,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/invenio-oauth2server/babel.ini

@@ -15,7 +15,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/invenio-previewer/babel.ini

@@ -31,7 +31,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/invenio-records/babel.ini

@@ -15,7 +15,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/invenio-resourcesyncclient/babel.ini

@@ -15,7 +15,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/invenio-resourcesyncserver/babel.ini

@@ -15,7 +15,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-accounts/babel.ini

@@ -27,7 +27,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-accounts/tests/test_views.py

@@ -55,11 +55,11 @@ def test_redirect_method(app,mocker):
         )
         mock_render = mocker.patch("weko_accounts.views.redirect",return_value=make_response())
         _redirect_method(False)
-        mock_render.assert_called_with("http://TEST_SERVER.localdomain/secure/login.php")
+        mock_render.assert_called_with("http://TEST_SERVER.localdomain/secure/login.py")
 
         mock_render = mocker.patch("weko_accounts.views.redirect",return_value=make_response())
         _redirect_method(True)
-        mock_render.assert_called_with("http://TEST_SERVER.localdomain/secure/login.php?next="+url)
+        mock_render.assert_called_with("http://TEST_SERVER.localdomain/secure/login.py?next="+url)
 
 #def index():
 # .tox/c1/bin/pytest --cov=weko_accounts tests/test_views.py::test_index -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-workflow/.tox/c1/tmp
@@ -398,15 +398,15 @@ def test_shib_stub_login(client,mocker):
     # next is /
     mock_redirect = mocker.patch("weko_accounts.views.redirect",return_value=make_response())
     res = client.get(url+"?next=/")
-    mock_redirect.assert_called_with("http://test_server.localdomain/secure/login.php?next=/")
+    mock_redirect.assert_called_with("http://test_server.localdomain/secure/login.py?next=/")
 
     # next is /next_page
     res = client.get(url+"?next=/next_page")
-    mock_redirect.assert_called_with("http://test_server.localdomain/secure/login.php?next=/next_page")
+    mock_redirect.assert_called_with("http://test_server.localdomain/secure/login.py?next=/next_page")
 
     # next is None
     res = client.get(url)
-    mock_redirect.assert_called_with("http://test_server.localdomain/secure/login.php?next=/")
+    mock_redirect.assert_called_with("http://test_server.localdomain/secure/login.py?next=/")
 
     current_app.config.update(
         WEKO_ACCOUNTS_SHIB_IDP_LOGIN_ENABLED=False

modules/weko-accounts/weko_accounts/config.py

@@ -58,7 +58,7 @@
 WEKO_ACCOUNTS_SHIB_LOGIN_CACHE_TTL = 180
 """Cache default timeout 3 minute"""
 
-WEKO_ACCOUNTS_SHIB_IDP_LOGIN_URL = '{}secure/login.php'
+WEKO_ACCOUNTS_SHIB_IDP_LOGIN_URL = '{}secure/login.py'
 """Login proxy URL."""
 
 WEKO_ACCOUNTS_SSO_ATTRIBUTE_MAP = {

modules/weko-admin/babel.ini

@@ -27,8 +27,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-slient = false
-extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-authors/babel.ini

@@ -27,7 +27,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-bulkupdate/babel.ini

@@ -14,7 +14,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-deposit/babel.ini

@@ -27,7 +27,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-gridlayout/babel.ini

@@ -14,7 +14,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-groups/babel.ini

@@ -27,8 +27,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-slient = false
-extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-handle/babel.ini

@@ -14,7 +14,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-index-tree/babel.ini

@@ -27,7 +27,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-indextree-journal/babel.ini

@@ -15,7 +15,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-items-autofill/babel.ini

@@ -14,7 +14,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-items-ui/babel.ini

@@ -27,8 +27,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-slient = false
-extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-items-ui/tests/test_views.py

@@ -20469,25 +20469,44 @@ def test_index_upload_acl(client, db_sessionlifetime, users, id, status_code):
 
 # def get_search_data(data_type=''):
 # .tox/c1/bin/pytest --cov=weko_items_ui tests/test_views.py::test_get_search_data_acl -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-items-ui/.tox/c1/tmp
-def test_get_search_data_acl(client_api, db_sessionlifetime):
+def test_get_search_data_acl_nologin(client_api, db_sessionlifetime):
     url = url_for(
         "weko_items_ui_api.get_search_data", data_type="username", _external=True
     )
     res = client_api.get(url)
-    assert res.status_code == 200
-    url = url_for(
-        "weko_items_ui_api.get_search_data", data_type="email", _external=True
-    )
-    res = client_api.get(url)
-    assert res.status_code == 200
+    assert res.status_code == 302
 
-    url = url_for("weko_items_ui_api.get_search_data", data_type="hoge", _external=True)
-    res = client_api.get(url)
-    assert res.status_code == 200
+
+@pytest.mark.parametrize(
+    "id, status_code",
+    [
+        (0, 200),
+        (1, 200),
+        (2, 200),
+        (3, 200),
+        (4, 403),
+        (5, 403),
+        (6, 200),
+        (7, 403),
+    ],
+)
+def test_get_search_data_acl(client_api, db_sessionlifetime, users, id, status_code):
+    login_user_via_session(client=client_api, email=users[id]["email"])
+
+    for data_type in ("username", "email", "hoge"):
+        url = url_for(
+            "weko_items_ui_api.get_search_data",
+            data_type=data_type,
+            _external=True,
+        )
+        res = client_api.get(url)
+        assert res.status_code == status_code
 
 
 # .tox/c1/bin/pytest --cov=weko_items_ui tests/test_views.py::test_get_search_data -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-items-ui/.tox/c1/tmp
 def test_get_search_data(client_api, users, db_userprofile, db_sessionlifetime):
+    login_user_via_session(client=client_api, email=users[0]["email"])
+
     url = url_for(
         "weko_items_ui_api.get_search_data", data_type="username", _external=True
     )
@@ -20497,7 +20516,6 @@ def test_get_search_data(client_api, users, db_userprofile, db_sessionlifetime):
         "error": "",
         "results": [
             "user",
-            "contributor",
             "comadmin",
             "repoadmin",
             "sysadmin",
@@ -20515,7 +20533,6 @@ def test_get_search_data(client_api, users, db_userprofile, db_sessionlifetime):
         "error": "",
         "results": [
             "user@test.org",
-            "contributor@test.org",
             "comadmin@test.org",
             "repoadmin@test.org",
             "sysadmin@test.org",

modules/weko-items-ui/weko_items_ui/views.py

@@ -671,6 +671,7 @@ def index_upload():
 
 @blueprint_api.route('/get_search_data/<data_type>', methods=['GET'])
 @login_required
+@item_permission.require(http_exception=403)
 def get_search_data(data_type=''):
     """get_search_data.
 

modules/weko-itemtypes-ui/babel.ini

@@ -27,7 +27,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files
 

modules/weko-logging/babel.ini

@@ -27,7 +27,8 @@ encoding = utf-8
 
 [jinja2: **/templates/**.html]
 encoding = utf-8
-extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension
+silent = false
+extensions = jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.loopcontrols, jinja2.ext.i18n, jinja2.ext.do
 
 # Extraction from JavaScript files