Merge remote-tracking branch 'remotes/origin/feature/nii_grdm_202603_step4/2.2_quota_calculation_when_move_file' into feature/nii_grdm_202510_step2/2.3_mapcore_group_management_addon

Author: tma-hcphat

addons/metadata/static/metadata-fields.js

@@ -524,6 +524,9 @@ const TextFormField = oop.extend(FormFieldInterface, {
 
   getValue: function() {
     const self = this;
+    if (self.usedTypeahead) {
+      return self.input.typeahead('val');  // typeahead API を使用
+    }
     return self.input.val();
   },
 

addons/weko/deposit.py

@@ -287,7 +287,7 @@ def _deposit_metadata(
         if update_task_state:
             update_task_state(state='packaging', meta={
                 'progress': 50,
-                'paths': path,
+                'paths': ad_metadata_paths,
             })
 
         c = weko_addon.create_client()

addons/weko/mappings/ms2-mibyodb-metadata-mappings-ro-crate.json

@@ -412,6 +412,7 @@
             "dateCreated": "{{ date_registered_in_metadata_value }}",
             "hasPart[]": [
                 {
+                    "@createIf": "{{ choose_additional_metadata_value }}",
                     ".@type": "File",
                     ".@id": "files/{{choose_additional_metadata_value}}",
                     "name": "{{choose_additional_metadata_value}}",

addons/weko/schema/ro_crate.py

@@ -530,7 +530,9 @@ def _build_hierarchical_object(user, target_index, file_metadata, download_file_
                 value = source_data.get('value', '')
                 if 'choose-additional-metadata' in value:
                     url = value['choose-additional-metadata']
-                    value_data = json.loads(url['value'])
+                    value_data = json.loads(url.get('value') or '[]')
+                    if not value_data:
+                        continue
                     file_path = value_data[0]['path']
                     file_name = file_path.split('/')[-1]
                     for item in value_data:

osf/migrations/0261_ensure_schema_mappings.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.28 on 2024-11-07 22:16
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+def ensure_registration_mappings(*args):
+    from api.base import settings
+    from addons.weko.apps import NAME
+    from addons.weko.utils import ensure_registration_metadata_mapping
+    from addons.weko.mappings import REGISTRATION_METADATA_MAPPINGS
+    if NAME not in settings.INSTALLED_APPS:
+        return
+    for schema_name, mappings in REGISTRATION_METADATA_MAPPINGS:
+        ensure_registration_metadata_mapping(schema_name, mappings)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osf', '0260_merge_20251126_1230'),
+    ]
+
+    operations = [
+        migrations.RunPython(ensure_registration_mappings, ensure_registration_mappings),
+    ]

osf/migrations/0264_merge_20260218_0749.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.28 on 2026-02-18 07:49
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osf', '0263_merge_20260130_1152'),
+        ('osf', '0261_ensure_schema_mappings'),
+    ]
+
+    operations = [
+    ]

requirements.txt

@@ -30,7 +30,7 @@ bcrypt==3.1.4
 python-dateutil>=2.7.3
 python-gnupg==0.4.1
 pytz==2017.3
-bleach==2.1.3
+bleach==2.1.4
 html5lib==0.999999999
 blinker==1.4
 furl==0.4.92