Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/multiTenancyDeployLocal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Clone the cloud-cap-samples-java repo 🌐
run: |
echo "🔄 Cloning repository..."
git clone --depth 1 --branch local_mtTests https://github.com/vibhutikumar07/cloud-cap-samples-java.git
git clone --depth 1 --branch appChngsForCrctPageTitles https://github.com/vibhutikumar07/cloud-cap-samples-java.git
echo "✅ Repository cloned!"

- name: Override cds.services.version (runtime only)
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</developers>

<properties>
<revision>1.7.1-SNAPSHOT</revision>
<revision>1.0.0-RC1</revision>
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ public void updateName(
String attachmentCompositionDefinition = entry.getKey();
String attachmentCompositionName = entry.getValue().get("name");
String parentTitle = entry.getValue().get("parentTitle");
String parentTitleMap = entry.getValue().get("parentTitleMap");
Map<String, String> propertyTitles = new HashMap<>();
Map<String, String> secondaryPropertiesWithInvalidDefinitions = new HashMap<>();
String targetEntity = context.getTarget().getQualifiedName();
Expand All @@ -160,7 +161,12 @@ public void updateName(
context.getModel().findEntity(attachmentCompositionDefinition);
isError =
AttachmentsHandlerUtils.validateFileNames(
context, data, attachmentCompositionName, contextInfo, attachmentEntity);
context,
data,
attachmentCompositionName,
contextInfo,
attachmentEntity,
parentTitleMap);
if (!isError) {
List<String> fileNameWithRestrictedCharacters = new ArrayList<>();
List<String> duplicateFileNameList = new ArrayList<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ public void updateName(
String attachmentCompositionDefinition = entry.getKey();
String attachmentCompositionName = entry.getValue().get("name");
String parentTitle = entry.getValue().get("parentTitle");
String parentTitleMap = entry.getValue().get("parentTitleMap");
Boolean isError = false;

// Extract composition name (last part after the final ".")
Expand All @@ -154,7 +155,12 @@ public void updateName(
}
isError =
AttachmentsHandlerUtils.validateFileNames(
context, data, attachmentCompositionName, contextInfo, attachmentEntity);
context,
data,
attachmentCompositionName,
contextInfo,
attachmentEntity,
parentTitleMap);
if (!isError) {
renameDocument(
attachmentEntity,
Expand Down
Loading
Loading