entity manager trimming

This commit is contained in:
yuri
2016-05-05 12:12:40 +03:00
parent ad5f29338b
commit ea5dcfe630
4 changed files with 21 additions and 10 deletions
@@ -82,6 +82,8 @@ class EntityManager
throw new Error();
}
$name = trim($name);
$normalizedName = Util::normilizeClassName($name);
$contents = "<" . "?" . "php\n\n".
@@ -270,9 +272,9 @@ class EntityManager
$linkType = $params['linkType'];
$entity = $params['entity'];
$link = $params['link'];
$link = trim($params['link']);
$entityForeign = $params['entityForeign'];
$linkForeign = $params['linkForeign'];
$linkForeign = trim($params['linkForeign']);
$label = $params['label'];
$labelForeign = $params['labelForeign'];
@@ -89,6 +89,7 @@ class FieldManager
public function update($name, $fieldDefs, $scope)
{
$name = trim($name);
/*Add option to metadata to identify the custom field*/
if (!$this->isCore($name, $scope)) {
$fieldDefs[$this->customOptionName] = true;
@@ -120,7 +120,8 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
defs: {
name: 'name',
params: {
required: true
required: true,
trim: true
}
},
readOnly: scope != false
@@ -132,7 +133,8 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
defs: {
name: 'labelSingular',
params: {
required: true
required: true,
trim: true
}
}
});
@@ -143,7 +145,8 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
defs: {
name: 'labelPlural',
params: {
required: true
required: true,
trim: true
}
}
});
@@ -174,7 +174,8 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
defs: {
name: 'link',
params: {
required: true
required: true,
trim: true
}
},
readOnly: !isNew
@@ -186,7 +187,8 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
defs: {
name: 'linkForeign',
params: {
required: true
required: true,
trim: true
}
},
readOnly: !isNew
@@ -198,7 +200,8 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
defs: {
name: 'label',
params: {
required: true
required: true,
trim: true
}
}
});
@@ -209,7 +212,8 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
defs: {
name: 'labelForeign',
params: {
required: true
required: true,
trim: true
}
}
});
@@ -222,7 +226,8 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
defs: {
name: 'relationName',
params: {
required: true
required: true,
trim: true
}
},
readOnly: !isNew