Skip to content

Added support for display name in DataProperty and NavigationProperty #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ioancrisan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for display name in DataProperty and NavigationProperty #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Breeze.Client/Metadata/metadata.example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ var x = {
},
{
"name": "categoryName",
"displayName": "Category name",
"dataType": "String",
"isNullable": false,
"defaultValue": "",
Expand Down
8 changes: 8 additions & 0 deletions Breeze.Client/Metadata/metadata.schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ var x = {
"description": "The server side side name of this property. Either name or nameOnServer must be specified and either is sufficient.",
"type": "string"
},
"displayName": {
"description": "The property display name. It is used for example in validation, replacing the %displayName% macro definition.",
"type": "string"
},
"dataType": {
"description": "If present, the complexType name should be omitted.",
"enum": [
Expand Down Expand Up @@ -208,6 +212,10 @@ var x = {
"description": "The server side side name of this property. Either name or nameOnServer must be specified and either is sufficient.",
"type": "string"
},
"displayName": {
"description": "The property display name. It is used for example in validation, replacing the %displayName% macro definition.",
"type": "string"
},
"entityTypeName": {
"description": "The type of the entity or collection of entities returned by this property.",
"$ref": "#/definitions/structuralTypeName"
Expand Down
4 changes: 4 additions & 0 deletions Breeze.Client/Scripts/IBlade/a40_entityMetadata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2044,6 +2044,7 @@ var DataProperty = (function () {
@param [config.nameOnServer] {String} Same as above but the name is that defined on the server.
Either this or the 'name' above must be specified. Whichever one is specified the other will be computed using
the NamingConvention on the MetadataStore associated with the EntityType to which this will be added.
@param [config.displayName] {String}
@param [config.dataType=DataType.String] {DataType}
@param [config.complexTypeName] {String}
@param [config.isNullable=true] {Boolean}
Expand All @@ -2058,6 +2059,7 @@ var DataProperty = (function () {
assertConfig(config)
.whereParam("name").isString().isOptional()
.whereParam("nameOnServer").isString().isOptional()
.whereParam("displayName").isString().isOptional()
.whereParam("dataType").isEnumOf(DataType).isOptional().or().isString().or().isInstanceOf(ComplexType)
.whereParam("complexTypeName").isOptional()
.whereParam("isNullable").isBoolean().isOptional().withDefault(true)
Expand Down Expand Up @@ -2302,6 +2304,7 @@ var NavigationProperty = (function () {
@param [config.nameOnServer] {String} Same as above but the name is that defined on the server.
Either this or the 'name' above must be specified. Whichever one is specified the other will be computed using
the NamingConvention on the MetadataStore associated with the EntityType to which this will be added.
@param [config.displayName] {String}
@param config.entityTypeName {String} The fully qualified name of the type of entity that this property will return. This type
need not yet have been created, but it will need to get added to the relevant MetadataStore before this EntityType will be 'complete'.
The entityType name is constructed as: {shortName} + ":#" + {namespace}
Expand All @@ -2318,6 +2321,7 @@ var NavigationProperty = (function () {
assertConfig(config)
.whereParam("name").isString().isOptional()
.whereParam("nameOnServer").isString().isOptional()
.whereParam("displayName").isString().isOptional()
.whereParam("entityTypeName").isString()
.whereParam("isScalar").isBoolean()
.whereParam("associationName").isString().isOptional()
Expand Down