Merge remote-tracking branch 'origin/maven/fixes/9.0' into maven/rele…

…ase/9.0
edu-sharing · Nov 14, 2024 · a6c3ff1 · a6c3ff1
2 parents a22d8e1 + e39a5cd
commit a6c3ff1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/...d/services/core/src/main/java/org/edu_sharing/restservices/rendering/v1/RenderingApi.java b/...d/services/core/src/main/java/org/edu_sharing/restservices/rendering/v1/RenderingApi.java
@@ -104,8 +104,7 @@ public Response getDetailsSnippetWithParameters(
 			}
 
 			if(remote != null) {
-				org.edu_sharing.generated.repository.backend.services.rest.client.model.RenderingDetailsEntry entity = (org.edu_sharing.generated.repository.backend.services.rest.client.model.RenderingDetailsEntry) RepoProxyFactory.getRepoProxy().getDetailsSnippetWithParameters(remote.getRepository(), remote.getNodeId(), nodeVersion, displayMode, parameters, req).getEntity();
-				return Response.status(Response.Status.OK).entity(entity).build();
+				return RepoProxyFactory.getRepoProxy().getDetailsSnippetWithParameters(remote.getRepository(), remote.getNodeId(), nodeVersion, displayMode, parameters, req);
 			} else {
 				RenderingDetails detailsSnippet = new RenderingDao(repoDao).getDetails(node, nodeVersion, displayMode, parameters);
 				if(detailsSnippet.getException() != null) {

diff --git a/Frontend/src/app/common/ui/node-render/node-render.component.ts b/Frontend/src/app/common/ui/node-render/node-render.component.ts
@@ -671,20 +671,25 @@ export class NodeRenderComponent implements EventListener, OnInit, OnDestroy, Af
 
     private getSequence(onFinish: () => void) {
         if (this._node.aspects.indexOf(RestConstants.CCM_ASPECT_IO_CHILDOBJECT) != -1) {
-            this.nodeApi.getNodeMetadata(this._node.parent.id).subscribe((data) => {
-                this.sequenceParent = data.node;
-                this.nodeApi
-                    .getNodeChildobjects(this.sequenceParent.ref.id, this.sequenceParent.ref.repo)
-                    .subscribe((data: NodeList) => {
-                        if (data.nodes.length > 0) {
-                            this.sequence = data;
-                        } else {
-                            this.sequence = null;
-                        }
-                        setTimeout(() => this.setScrollparameters(), 100);
-                        onFinish();
-                    });
-            });
+            this.nodeApi
+                .getNodeMetadata(this._node.parent.id, [RestConstants.ALL], this._node.parent.repo)
+                .subscribe((data) => {
+                    this.sequenceParent = data.node;
+                    this.nodeApi
+                        .getNodeChildobjects(
+                            this.sequenceParent.ref.id,
+                            this.sequenceParent.ref.repo,
+                        )
+                        .subscribe((data: NodeList) => {
+                            if (data.nodes.length > 0) {
+                                this.sequence = data;
+                            } else {
+                                this.sequence = null;
+                            }
+                            setTimeout(() => this.setScrollparameters(), 100);
+                            onFinish();
+                        });
+                });
         } else {
             this.sequenceParent = this._node;
             this.nodeApi

diff --git a/deploy/docker/build/service/src/main/build/assets/entrypoint.sh b/deploy/docker/build/service/src/main/build/assets/entrypoint.sh
@@ -380,6 +380,8 @@ grep -q '^[#]*\s*alfresco-pdf-renderer\.exe=' "${alfProps}" || echo 'alfresco-pd
 
 sed -i -r 's|^[#]*\s*local\.transform\.pipeline\.config\.dir=.*|local.transform.pipeline.config.dir='"$ALF_HOME/tomcat/shared/classes/config/defaults/transform/pipelines|" "${alfProps}"
 grep -q '^[#]*\s*local\.transform\.pipeline\.config\.dir=' "${alfProps}" || echo "local.transform.pipeline.config.dir=$ALF_HOME/tomcat/shared/classes/config/defaults/transform/pipelines" >>"${alfProps}"
+# fix: Error reading /opt/alfresco/tomcat/shared/classes/config/defaults/transform/pipelines/.gitkeep
+rm -f "$ALF_HOME/tomcat/shared/classes/config/default/transform/pipelines/.gitkeep"
 
 sed -i -r 's|^[#]*\s*ooo\.exe=.*|ooo.exe=|' "${alfProps}"
 grep -q '^[#]*\s*ooo\.exe=' "${alfProps}" || echo "ooo.exe=" >>"${alfProps}"