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

Merge branch 'front/dz-post-data' of github.com:strapi/strapi into ctb/events

Browse Source
This commit is contained in:
soupette 2019-12-12 16:13:45 +01:00
commit a01112df00
1 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1352,31 +1352,60 @@ const FormModal = () => {
{formatMessage({ id: getTrad('form.button.delete') })}
</Button>
)}
<CustomButton
type={isCreating ? 'submit' : 'button'}
color={
(isCreatingContentType ||
isCreatingComponent ||
isEditingCategory ||
{isCreating && state.attributeType === 'dynamiczone' && (
<CustomButton
type={isCreating ? 'submit' : 'button'}
color={
(isCreatingContentType ||
isCreatingComponent ||
isEditingCategory ||
(state.modalType === 'addComponentToDynamicZone' &&
state.step === '1' &&
!isCreatingComponentFromAView)) &&
!isCreating
? 'success'
: 'primary'
}
onClick={e => handleSubmit(e, true)}
icon={
(isCreatingAttribute &&
!isCreatingComponentFromAView &&
state.step !== '1') ||
(state.modalType === 'addComponentToDynamicZone' &&
state.step === '1' &&
!isCreatingComponentFromAView)) &&
!isCreating
? 'success'
: 'primary'
}
onClick={e => handleSubmit(e, true)}
icon={
(isCreatingAttribute &&
!isCreatingComponentFromAView &&
state.step !== '1') ||
(state.modalType === 'addComponentToDynamicZone' &&
isCreatingComponentFromAView) ||
(isCreatingComponentFromAView && state.step === '2')
}
>
{getButtonSubmitMessage()}
</CustomButton>
isCreatingComponentFromAView) ||
(isCreatingComponentFromAView && state.step === '2')
}
>
{getButtonSubmitMessage()}
</CustomButton>
)}
{state.attributeType !== 'dynamiczone' && (
<CustomButton
type={isCreating ? 'submit' : 'button'}
color={
(isCreatingContentType ||
isCreatingComponent ||
isEditingCategory ||
(state.modalType === 'addComponentToDynamicZone' &&
state.step === '1' &&
!isCreatingComponentFromAView)) &&
!isCreating
? 'success'
: 'primary'
}
onClick={e => handleSubmit(e, true)}
icon={
(isCreatingAttribute &&
!isCreatingComponentFromAView &&
state.step !== '1') ||
(state.modalType === 'addComponentToDynamicZone' &&
isCreatingComponentFromAView) ||
(isCreatingComponentFromAView && state.step === '2')
}
>
{getButtonSubmitMessage()}
</CustomButton>
)}
</div>
</section>
</ModalFooter>