Skip to content

Commit 4b749f4

Browse files
committed
Merge branch 'createAttachmentInActiveEntity' of https://www.github.com/cap-java/sdm into createAttachmentInActiveEntity
2 parents f4a83ad + 2bdc011 commit 4b749f4

10 files changed

Lines changed: 796 additions & 1479 deletions

.github/workflows/cfdeploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo tee /etc/apt/trusted.gpg.d/cloudfoundry.asc
115115
echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
116116
sudo apt update
117-
sudo apt install cf-cli
117+
sudo apt install cf8-cli
118118
119119
cf install-plugin multiapps -f
120120
@@ -249,7 +249,7 @@ jobs:
249249
wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo tee /etc/apt/trusted.gpg.d/cloudfoundry.asc
250250
echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
251251
sudo apt update
252-
sudo apt install cf-cli
252+
sudo apt install cf8-cli
253253
254254
cf install-plugin multiapps -f
255255

.github/workflows/multiTenancyDeployLocal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo tee /etc/apt/trusted.gpg.d/cloudfoundry.asc
106106
echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
107107
sudo apt update
108-
sudo apt install cf-cli
108+
sudo apt install cf8-cli
109109
110110
cf install-plugin multiapps -f
111111
echo "✅ Cloud Foundry CLI setup complete!"

.github/workflows/multiTenant_deploy_and_Integration_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo tee /etc/apt/trusted.gpg.d/cloudfoundry.asc
8282
echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
8383
sudo apt update
84-
sudo apt install cf-cli
84+
sudo apt install cf8-cli
8585
8686
cf install-plugin multiapps -f
8787
echo "✅ Cloud Foundry CLI setup complete!"

.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo tee /etc/apt/trusted.gpg.d/cloudfoundry.asc
130130
echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
131131
sudo apt update
132-
sudo apt install cf-cli
132+
sudo apt install cf8-cli
133133
134134
cf install-plugin multiapps -f
135135
echo "✅ Cloud Foundry CLI setup complete!"

.github/workflows/singleTenant_deploy_and_Integration_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
echo "deb https://packages.cloudfoundry.org/debian stable main" \
9999
| sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
100100
sudo apt update
101-
sudo apt install cf-cli
101+
sudo apt install cf8-cli
102102
103103
# Install cf CLI plugin
104104
cf install-plugin multiapps -f
@@ -235,4 +235,4 @@ jobs:
235235
236236

237237

238-
238+

.github/workflows/singleTenant_deploy_and_Integration_test_LatestVersion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
echo "deb https://packages.cloudfoundry.org/debian stable main" \
150150
| sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
151151
sudo apt update
152-
sudo apt install cf-cli
152+
sudo apt install cf8-cli
153153
154154
# Install cf CLI plugin
155155
cf install-plugin multiapps -f

sdm/src/main/java/com/sap/cds/sdm/service/handler/SDMCustomServiceHandler.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,6 +1654,7 @@ private Map<String, Object> buildBasicFields(
16541654
fields.put("repositoryId", data.getRepositoryId());
16551655
fields.put("folderId", data.getFolderId());
16561656
fields.put("status", "Clean");
1657+
fields.put("uploadStatus", SDMConstants.UPLOAD_STATUS_SUCCESS);
16571658
fields.put("mimeType", mimeType);
16581659
fields.put("type", cmisDocument.getType());
16591660
fields.put("fileName", fileName);
@@ -1807,6 +1808,7 @@ private void createDraftEntries(
18071808
updatedFields.put("repositoryId", request.getRepositoryId());
18081809
updatedFields.put("folderId", request.getFolderId());
18091810
updatedFields.put("status", "Clean");
1811+
updatedFields.put("uploadStatus", SDMConstants.UPLOAD_STATUS_SUCCESS);
18101812
updatedFields.put("mimeType", mimeType);
18111813
updatedFields.put("type", cmisDocument.getType()); // Individual type for each attachment
18121814
updatedFields.put("fileName", fileName);

0 commit comments

Comments
 (0)