yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 07:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

attributes edit validation fix

Browse Source
This commit is contained in:
Virginie Ky 2019-08-02 16:19:02 +02:00
parent 3576d8a7fa
commit 92ab80529f
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/index.js
View File

@ -59,7 +59,9 @@ class AttributeForm extends React.Component {
let formErrors = {};
const formValidations = this.getFormValidations();
const alreadyTakenAttributesUpdated = alreadyTakenAttributes.filter(
attribute => attribute !== attributeToEditName
attribute => {
return attribute !== attributeToEditName;
}
);
if (isEmpty(modifiedData.name)) {
@ -139,9 +141,17 @@ class AttributeForm extends React.Component {
handleGoTo = to => {
const { emitEvent } = this.context;
const { actionType, attributeToEditName, attributeType, push } = this.props;
const {
actionType,
attributeToEditIndex,
attributeToEditName,
attributeType,
push,
} = this.props;
const attributeName =
actionType === 'edit' ? `&attributeName=${attributeToEditName}` : '';
actionType === 'edit'
? `&attributeName=${attributeToEditIndex || attributeToEditName}`
: '';
if (to === 'advanced') {
emitEvent('didSelectContentTypeFieldSettings');
@ -344,6 +354,7 @@ AttributeForm.contextTypes = {
AttributeForm.defaultProps = {
actionType: 'create',
activeTab: 'base',
attributeToEditIndex: null,
attributeToEditName: '',
alreadyTakenAttributes: [],
attributeType: 'string',
@ -361,6 +372,7 @@ AttributeForm.propTypes = {
actionType: PropTypes.string,
activeTab: PropTypes.string,
alreadyTakenAttributes: PropTypes.array,
attributeToEditIndex: PropTypes.string,
attributeToEditName: PropTypes.string,
attributeType: PropTypes.string,
attributeOptions: PropTypes.array,

1
packages/strapi-plugin-content-type-builder/admin/src/containers/GroupPage/index.js
View File

@ -551,6 +551,7 @@ export class GroupPage extends React.Component {
activeTab={this.getSettingType()}
alreadyTakenAttributes={this.getFeatureAttributesNames()}
attributeType={this.getAttributeType()}
attributeToEditIndex={this.getAttributeIndex()}
attributeToEditName={this.getAttributeName()}
featureType={this.featureType}
isOpen={