Skip to content

Commit 3a19bc0

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature-tree-table
2 parents 9fe4f93 + 7225b21 commit 3a19bc0

File tree

17 files changed

+2764
-62
lines changed

17 files changed

+2764
-62
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Welcome to the bookshop-java project. It demonstrates how to build business appl
1515
- [Demonstrated Features](#demonstrated-features)
1616
- [Getting Started](#getting-started)
1717
- [Prerequisites](#prerequisites)
18-
- [Clone Build & Run](#clone-build--run)
18+
- [Clone Build & Run](#clone-build-run)
1919
- [Using VS Code](#using-vs-code)
2020
- [Using Eclipse](#using-eclipse)
2121
- [Building and Running](#building-and-running)
@@ -247,6 +247,8 @@ Deploy as Multitenant Application:
247247
- Run `cf deploy mta_archives/bookshop-mt_1.0.0.mtar`
248248
- Go to another subaccount in your global account, under subscriptions and subscribe to the application you deployed.
249249
- Run `cf map-route bookshop-mt-app <YOUR DOMAIN> --hostname <SUBSCRIBER TENANT>-<ORG>-<SPACE>-bookshop-mt-app` or create and bind the route manually.
250+
- `<YOUR DOMAIN>`: Find the app domain for your landscape by executing `cf domains`. It commonly starts with `cfapps.`.
251+
- `<SUBSCRIBER TENANT>`: The subdomain of the subscriber subaccount. You can find this info in the subaccount overview.
250252

251253
> [!NOTE]
252254
> Please note that the route length is limited to 63 characters and can easily be exceeded. So keeping the app name and sub-account subdomain as short as possible will help you stay within length.

app/_i18n/i18n.properties

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ModifiedBy = Modified By
77
General = General
88
Details = Details
99
Admin = Administrative
10+
Translations = Translations
1011

1112
ID = ID
1213
Currency = Currency
@@ -68,3 +69,11 @@ AddReview = Add Review
6869
Notes = Notes
6970
Note = Note
7071
ISBN = ISBN
72+
73+
attachment_content = Content
74+
attachment_mimeType = MIME Type
75+
attachment_fileName = File Name
76+
attachment_status = Status
77+
attachment_note = Note
78+
attachment = Cover
79+
attachments = Covers

app/_i18n/i18n_de.properties

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ModifiedBy = Bearbeitet von
77
General = Generelles
88
Details = Details
99
Admin = Administratives
10+
Translations = Übersetzungen
1011

1112
ID = ID
1213
Currency = W\u00E4hrung
@@ -68,3 +69,11 @@ AddReview = Rezension hinzufügen
6869
Notes = Notizen
6970
Note = Notiz
7071
ISBN = ISBN
72+
73+
attachment_content = Inhalt
74+
attachment_mimeType = MIME-Typ
75+
attachment_fileName = Dateiname
76+
attachment_status = Status
77+
attachment_note = Notiz
78+
attachment = Buchcover
79+
attachments = Buchcovers

app/admin/fiori-service.cds

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,16 @@ annotate AdminService.Books with @(UI : {
2626
Label : '{i18n>Details}',
2727
Target : '@UI.FieldGroup#Details'
2828
},
29+
{
30+
$Type : 'UI.ReferenceFacet',
31+
ID : 'AttachmentsFacet',
32+
Target : 'covers/@UI.LineItem'
33+
},
2934
{
3035
$Type : 'UI.ReferenceFacet',
3136
Label : '{i18n>Admin}',
3237
Target : '@UI.FieldGroup#Admin'
33-
},
38+
}
3439
],
3540
FieldGroup #General : {Data : [
3641
{Value : title},
@@ -169,3 +174,6 @@ annotate AdminService.Books actions {
169174
quantity @title : '{i18n>Quantity}'
170175
)
171176
}
177+
178+
// Hides technical field up__ID in View Setitings dialog for Books.covers
179+
annotate AdminService.Books.covers:up_ with @UI.Hidden;

app/fiori.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
};
1515
</script>
1616

17-
<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.129.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
18-
<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.129.0/resources/sap-ui-core.js"
17+
<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.131.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
18+
<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.131.0/resources/sap-ui-core.js"
1919
data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
2020
data-sap-ui-compatVersion="edge"
2121
data-sap-ui-theme="sap_horizon"

app/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

db/orders.cds

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ entity Orders : cuid, managed {
2020
entity OrderItems : cuid {
2121
parent : Association to Orders;
2222
book : Association to Books @mandatory @assert.target;
23+
@mandatory
24+
@assert.range: [(0), _]
2325
quantity : Integer;
2426
amount : Decimal(9, 2);
2527
}

0 commit comments

Comments
 (0)