Merge branch 'pull/651' into development

This commit is contained in:
Tomas Bures 2019-08-07 12:29:30 +02:00
commit 5cae9c849c
4 changed files with 9 additions and 9 deletions

View file

@ -152,8 +152,10 @@ export default class CUD extends Component {
}
const typeKey = state.getIn(['type', 'value']);
if (!typeKey) {
if (!typeKey && !state.getIn(['fromExistingEntity', 'value'])) {
state.setIn(['type', 'error'], t('typeMustBeSelected'));
}else{
state.setIn(['type', 'error'], null);
}
if (!state.getIn(['tag_language', 'value'])) {
@ -168,7 +170,7 @@ export default class CUD extends Component {
validateNamespace(t, state);
if (typeKey) {
if (typeKey && !state.getIn(['fromExistingEntity', 'value'])) {
this.templateTypes[typeKey].validate(state);
}
}