"Enable CF Merge branch 'OpenSAP-week3-unit5' of https://github.com/SAP-samples/cloud-cap-samples into OpenSAP-week3-unit5

2020-02-06 08:33:34 +00:00
parent 9932d02d57 cad3a32c78
commit fef327f344
8 changed files with 215 additions and 0 deletions
--- a/packages/bookshop/srv/admin-service.cds
+++ b/packages/bookshop/srv/admin-service.cds
@@ -14,7 +14,10 @@ annotate AdminService.Orders with @odata.draft.enabled;
 extend service AdminService with {
  entity OrderItems as select from my.OrderItems;
 }
+<<<<<<< HEAD

+=======
+>>>>>>> cad3a32c78620f4c4558fad34991dd48866af8d3
 // Restrict access to orders to users with role "admin"
 annotate AdminService.Orders with  @(restrict: [
   { grant: 'READ', to: 'admin' }