From 05145b23652115ace070bfc6c5a117ef2da6aee0 Mon Sep 17 00:00:00 2001 From: ivis-inoue Date: Thu, 13 Mar 2025 09:56:51 +0900 Subject: [PATCH] fix 50594 --- modules/weko-items-ui/weko_items_ui/utils.py | 2 ++ .../static/js/weko_itemtypes_ui/jsonschemaeditor.js | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/weko-items-ui/weko_items_ui/utils.py b/modules/weko-items-ui/weko_items_ui/utils.py index a9f6ed0a08..f209211737 100644 --- a/modules/weko-items-ui/weko_items_ui/utils.py +++ b/modules/weko-items-ui/weko_items_ui/utils.py @@ -4125,6 +4125,8 @@ def get_subs_item(self, key_list.append(new_key) key_label.append(new_label) if data and idx < len(data) and data[idx].get(key): + if isinstance(data[idx][key], list): + data[idx][key] = data[idx][key][0] key_data.append(escape_newline(data[idx][key])) # key_data.append(escape_str(data[idx][key])) else: diff --git a/modules/weko-itemtypes-ui/weko_itemtypes_ui/static/js/weko_itemtypes_ui/jsonschemaeditor.js b/modules/weko-itemtypes-ui/weko_itemtypes_ui/static/js/weko_itemtypes_ui/jsonschemaeditor.js index d6a53dae9e..6f160c65bf 100644 --- a/modules/weko-itemtypes-ui/weko_itemtypes_ui/static/js/weko_itemtypes_ui/jsonschemaeditor.js +++ b/modules/weko-itemtypes-ui/weko_itemtypes_ui/static/js/weko_itemtypes_ui/jsonschemaeditor.js @@ -1025,9 +1025,9 @@ }, React.createElement('option', {className: self.state.editor ? '' : 'hide', value: 'text'}, 'Text'), React.createElement('option', {className: self.state.editor ? '' : 'hide', value: 'textarea'}, 'Textarea'), - React.createElement('option', {value: 'checkboxes'}, 'Checkboxes'), - React.createElement('option', {value: 'radios'}, 'Radios'), - React.createElement('option', {value: 'select'}, 'Select'), + React.createElement('option', {className: (value.format == 'radios' || value.format == 'select') ? 'hide' : '', value: 'checkboxes'}, 'Checkboxes'), + React.createElement('option', {className: value.format == 'checkboxes' ? 'hide' : '',value: 'radios'}, 'Radios'), + React.createElement('option', {className: value.format == 'checkboxes' ? 'hide' : '',value: 'select'}, 'Select'), React.createElement('option', {className: self.state.editor ? '' : 'hide', value: 'datetime'}, 'Datetime'), React.createElement('option', {className: self.state.editor ? '' : 'hide', value: 'array'}, 'List'), React.createElement('option', {className: self.state.editor ? '' : 'hide', value: 'object'}, 'Object')