yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-25 22:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use display name in CM

Browse Source 
Signed-off-by: soupette <cyril@strapi.io>
This commit is contained in:
soupette 2021-10-21 12:23:46 +02:00
parent dbea85a09e
commit 972f4fbb41
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/admin-test-utils/lib/fixtures/collectionTypes/address.js
View File

@ -401,7 +401,7 @@ const addressCT = {
isDisplayed: true, isDisplayed: true,
apiID: 'address', apiID: 'address',
kind: 'collectionType', kind: 'collectionType',
info: { name: 'address', description: '', label: 'Addresses' }, info: { displayName: 'addresse', name: 'address', description: '', label: 'Addresses' },
options: { options: {
draftAndPublish: true, draftAndPublish: true,
increments: true, increments: true,

2
packages/core/admin/admin/src/content-manager/pages/App/utils/generateModelsLinks.js
View File

@ -33,7 +33,7 @@ const generateLinks = (links, type, configurations = []) => {
permissions, permissions,
search, search,
kind: link.kind, kind: link.kind,
title: link.info.label, title: link.info.displayName,
to: `/content-manager/${link.kind}/${link.uid}`, to: `/content-manager/${link.kind}/${link.uid}`,
uid: link.uid, uid: link.uid,
// Used for the list item key in the helper plugin // Used for the list item key in the helper plugin

12
packages/core/admin/admin/src/content-manager/pages/App/utils/tests/generateModelsLinks.test.js
View File

@ -23,7 +23,7 @@ describe('ADMIN | LeftMenu | utils', () => {
kind: 'collectionType', kind: 'collectionType',
uid: 'api::address.address', uid: 'api::address.address',
info: { info: {
label: 'Addresses', displayName: 'Addresses',
}, },
}, },
{ {
@ -31,7 +31,7 @@ describe('ADMIN | LeftMenu | utils', () => {
kind: 'collectionType', kind: 'collectionType',
uid: 'api::test.test', uid: 'api::test.test',
info: { info: {
label: 'Test', displayName: 'Test',
}, },
}, },
{ {
@ -39,7 +39,7 @@ describe('ADMIN | LeftMenu | utils', () => {
kind: 'singleType', kind: 'singleType',
uid: 'api::test1.test1', uid: 'api::test1.test1',
info: { info: {
label: 'Test 1', displayName: 'Test 1',
}, },
}, },
]; ];
@ -97,7 +97,7 @@ describe('ADMIN | LeftMenu | utils', () => {
kind: 'collectionType', kind: 'collectionType',
uid: 'api::address.address', uid: 'api::address.address',
info: { info: {
label: 'Addresses', displayName: 'Addresses',
}, },
}, },
{ {
@ -105,7 +105,7 @@ describe('ADMIN | LeftMenu | utils', () => {
kind: 'collectionType', kind: 'collectionType',
uid: 'api::test.test', uid: 'api::test.test',
info: { info: {
label: 'Test', displayName: 'Test',
}, },
}, },
{ {
@ -113,7 +113,7 @@ describe('ADMIN | LeftMenu | utils', () => {
kind: 'singleType', kind: 'singleType',
uid: 'api::test1.test1', uid: 'api::test1.test1',
info: { info: {
label: 'Test 1', displayName: 'Test 1',
}, },
}, },
]; ];

6
packages/core/admin/admin/src/content-manager/pages/ListView/index.js
View File

@ -223,8 +223,8 @@ function ListView({
defaultMessage: 'Content', defaultMessage: 'Content',
}); });
const headerLayoutTitle = formatMessage({ const headerLayoutTitle = formatMessage({
id: contentType.info.label, id: contentType.info.displayName,
defaultMessage: contentType.info.label || defaultHeaderLayoutTitle, defaultMessage: contentType.info.displayName || defaultHeaderLayoutTitle,
}); });
const subtitle = canRead const subtitle = canRead
@ -324,7 +324,7 @@ ListView.propTypes = {
contentType: PropTypes.shape({ contentType: PropTypes.shape({
attributes: PropTypes.object.isRequired, attributes: PropTypes.object.isRequired,
metadatas: PropTypes.object.isRequired, metadatas: PropTypes.object.isRequired,
info: PropTypes.shape({ label: PropTypes.string.isRequired }).isRequired, info: PropTypes.shape({ displayName: PropTypes.string.isRequired }).isRequired,
layouts: PropTypes.shape({ layouts: PropTypes.shape({
list: PropTypes.array.isRequired, list: PropTypes.array.isRequired,
editRelations: PropTypes.array, editRelations: PropTypes.array,