Skip to content

Feature/w2025 33 #1868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kanon-yoneji merged 4 commits into from
Jun 12, 2026
Merged

Feature/w2025 33 #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ecd4bd
fix show list bibliographic
ivis-kikuchi Jun 9, 2026
4e93c64
Merge pull request #1162 from ivis-kikuchi/fix/show_list_bibliographic
kanon-yoneji Jun 10, 2026
a43c603
fix-W2025-33-903
kanon-yoneji Jun 11, 2026
aef5b6b
Merge pull request #1163 from kanon-yoneji/fix-W2025-33-903
kanon-yoneji Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions modules/weko-records-ui/weko_records_ui/static/js/weko_records_ui/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,9 @@ function handleChargeBillingFile() {
}

function handleConfirmBillingFile() {
if (!document.getElementById('current_user_email')) {
return;
}
const email = document.getElementById('current_user_email').value;
const charge_key = 'charge_' + email;
let charge_item = JSON.parse(window.sessionStorage.getItem(charge_key));
Expand Down
16 changes: 13 additions & 3 deletions modules/weko-records/weko_records/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,11 @@ def data_comment(result, data_result, stt_key, is_specify_newline_array):
result = get_author_comment(
data_result, key, result, is_specify_newline_array
)
elif "is_biographic_prop" in data_result[key] \
and data_result[key].pop("is_biographic_prop"):
for k, v in data_result[key].items():
if "value" in v:
result.append(v["value"])
else:
if "lang_id" in data_result[key]:
lang_id = (
Expand Down Expand Up @@ -2076,7 +2081,7 @@ def check_info_in_metadata(str_key_lang, str_key_val, str_lang, metadata):
for x in save:
if x.get(ob):
save = x.get(ob)

if isinstance(save, list):
for s in save:
if s is not None and str_lang is None:
Expand All @@ -2085,7 +2090,7 @@ def check_info_in_metadata(str_key_lang, str_key_val, str_lang, metadata):
value = s.get(str_key_val[len(str_key_val) - 1]).strip()
if len(value) > 0:
return value

if (
s
and isinstance(s, dict)
Expand Down Expand Up @@ -2492,7 +2497,12 @@ def add_biographic(
)
stt_key.append(bibliographic_key)
is_specify_newline_array.append({s["key"]: True})
data_result.update({bibliographic_key: {s["key"]: {"value": [bibliographic]}}})
data_result.update({
bibliographic_key: {
s["key"]: {"value": bibliographic},
"is_biographic_prop": True
}
})

return stt_key, data_result, is_specify_newline_array

Expand Down
Loading