yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 16:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use custom field labels in ListSettings

Browse Source
This commit is contained in:
Florian Merz 2022-08-17 16:13:31 +02:00 committed by Gustav Hansen
parent bf6cc98205
commit b70880d3e3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/DraggableCard.js
View File

@ -201,7 +201,7 @@ const DraggableCard = ({
id: getTrad('components.DraggableCard.move.field'), id: getTrad('components.DraggableCard.move.field'),
defaultMessage: 'Move {item}', defaultMessage: 'Move {item}',
}, },
{ item: name } { item: labelField }
)} )}
onClick={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}
ref={refs.dragRef} ref={refs.dragRef}
@ -223,7 +223,7 @@ const DraggableCard = ({
id: getTrad('components.DraggableCard.edit.field'), id: getTrad('components.DraggableCard.edit.field'),
defaultMessage: 'Edit {item}', defaultMessage: 'Edit {item}',
}, },
{ item: name } { item: labelField }
)} )}
type="button" type="button"
> >
@ -237,7 +237,7 @@ const DraggableCard = ({
id: getTrad('components.DraggableCard.delete.field'), id: getTrad('components.DraggableCard.delete.field'),
defaultMessage: 'Delete {item}', defaultMessage: 'Delete {item}',
}, },
{ item: name } { item: labelField }
)} )}
type="button" type="button"
> >

4
packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/Settings.js
View File

@ -16,7 +16,7 @@ const FlexGap = styled(Flex)`
const Settings = ({ modifiedData, onChange, sortOptions }) => { const Settings = ({ modifiedData, onChange, sortOptions }) => {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
const { settings } = modifiedData; const { settings, metadatas } = modifiedData;
return ( return (
<> <>
@ -122,7 +122,7 @@ const Settings = ({ modifiedData, onChange, sortOptions }) => {
> >
{sortOptions.map((sortBy) => ( {sortOptions.map((sortBy) => (
<Option key={sortBy} value={sortBy}> <Option key={sortBy} value={sortBy}>
{sortBy} {metadatas[sortBy].list.label || sortBy}
</Option> </Option>
))} ))}
</Select> </Select>

2
packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/SortDisplayedFields.js
View File

@ -104,7 +104,7 @@ const SortDisplayedFields = ({
> >
{listRemainingFields.map((field) => ( {listRemainingFields.map((field) => (
<MenuItem key={field} onClick={() => handleAddField(field)}> <MenuItem key={field} onClick={() => handleAddField(field)}>
{field} {metadatas[field].list.label || field}
</MenuItem> </MenuItem>
))} ))}
</SimpleMenu> </SimpleMenu>