Skip to content
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

Jump to bottom

ODATA-1471 - new - Core.ContentDisposition for media resources #151

Merged
merged 7 commits into from
Dec 2, 2021
Merged

ODATA-1471 - new - Core.ContentDisposition for media resources #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ae5c574
Core.ContentDisposition for media resources
ralfhandl Sep 3, 2021
b63e43f
Merge branch 'main' into ODATA-1471-Core.ContentDisposition-for-media…
HeikoTheissen Sep 3, 2021
da8a23a
Merge branch 'main' into ODATA-1471-Core.ContentDisposition-for-media…
ralfhandl Sep 17, 2021
66d0465
Merge branch 'main' into ODATA-1471-Core.ContentDisposition-for-media…
ralfhandl Oct 14, 2021
70cd0f3
Merge branch 'main' into ODATA-1471-Core.ContentDisposition-for-media…
ralfhandl Oct 15, 2021
b03c597
Merge branch 'main' into ODATA-1471-Core.ContentDisposition-for-media…
ralfhandl Nov 10, 2021
768225f
Merge branch 'main' into ODATA-1471-Core.ContentDisposition-for-media…
ralfhandl Dec 2, 2021
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
4 changes: 2 additions & 2 deletions vocabularies/Org.OData.Core.V1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,12 +503,12 @@
"ContentDisposition": {
"$Kind": "Term",
"$Type": "Core.ContentDispositionType",
"$Nullable": true,
"$AppliesTo": [
"EntityType",
"Property",
"Term"
],
"@Core.Description": "The content disposition of a binary or stream property or term"
"@Core.Description": "The content disposition of a media resource or a binary or stream property or term"
},
"ContentDispositionType": {
"$Kind": "ComplexType",
Expand Down
2 changes: 1 addition & 1 deletion vocabularies/Org.OData.Core.V1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Term|Type|Description
[AcceptableMediaTypes](./Org.OData.Core.V1.xml#L402:~:text=<Term%20Name="-,AcceptableMediaTypes,-")|\[MediaType\]|<a name="AcceptableMediaTypes"></a>Lists the MIME types acceptable for the annotated entity type marked with HasStream="true" or the annotated binary, stream, or string property or term.<br>The annotation of a TypeDefinition propagates to the model elements having this type
[MediaType](./Org.OData.Core.V1.xml#L408:~:text=<Term%20Name="-,MediaType,-")|MediaType?|<a name="MediaType"></a>The media type of the values of a binary or string or stream property or term.<br>The annotation of a TypeDefinition propagates to the model elements having this type
[IsMediaType](./Org.OData.Core.V1.xml#L414:~:text=<Term%20Name="-,IsMediaType,-")|[Tag](#Tag)|<a name="IsMediaType"></a>Properties and terms annotated with this term MUST contain a valid MIME type
[ContentDisposition](./Org.OData.Core.V1.xml#L419:~:text=<Term%20Name="-,ContentDisposition,-")|[ContentDispositionType?](#ContentDispositionType)|<a name="ContentDisposition"></a>The content disposition of a binary or stream property or term
[ContentDisposition](./Org.OData.Core.V1.xml#L419:~:text=<Term%20Name="-,ContentDisposition,-")|[ContentDispositionType](#ContentDispositionType)|<a name="ContentDisposition"></a>The content disposition of a media resource or a binary or stream property or term
[OptimisticConcurrency](./Org.OData.Core.V1.xml#L429:~:text=<Term%20Name="-,OptimisticConcurrency,-")|\[PropertyPath\]|<a name="OptimisticConcurrency"></a>Data modification requires the use of ETags. A non-empty collection contains the set of properties that are used to compute the ETag. An empty collection means that the service won't tell how it computes the ETag.
[AdditionalProperties](./Org.OData.Core.V1.xml#L433:~:text=<Term%20Name="-,AdditionalProperties,-")|[Tag](#Tag)|<a name="AdditionalProperties"></a>Instances of this type may contain properties in addition to those declared in $metadata<br>If specified as false clients can assume that instances will not contain dynamic properties, irrespective of the value of the OpenType attribute.
[AutoExpand](./Org.OData.Core.V1.xml#L438:~:text=<Term%20Name="-,AutoExpand,-")|[Tag](#Tag)|<a name="AutoExpand"></a>The service will automatically expand this stream or navigation property even if not requested with $expand
Expand Down
4 changes: 2 additions & 2 deletions vocabularies/Org.OData.Core.V1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,8 +416,8 @@
<Annotation Term="Core.RequiresType" String="Edm.String" />
</Term>

<Term Name="ContentDisposition" Type="Core.ContentDispositionType" AppliesTo="Property Term">
<Annotation Term="Core.Description" String="The content disposition of a binary or stream property or term" />
<Term Name="ContentDisposition" Type="Core.ContentDispositionType" Nullable="false" AppliesTo="EntityType Property Term">
<Annotation Term="Core.Description" String="The content disposition of a media resource or a binary or stream property or term" />
</Term>

<ComplexType Name="ContentDispositionType">
Expand Down