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

…ase/9.0
edu-sharing · Oct 10, 2024 · 6125163 · 6125163
2 parents 56867b5 + 64831e8
commit 6125163
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Backend/services/core/src/main/java/org/edu_sharing/restservices/shared/NodeUrls.java b/Backend/services/core/src/main/java/org/edu_sharing/restservices/shared/NodeUrls.java
@@ -14,7 +14,7 @@ public NodeUrls(Node node, String requestedVersion) {
         repositoryBaseUrl = URLHelper.getBaseUrl(true);
         if(node.getAspects().contains(CCConstants.getValidLocalName(CCConstants.CCM_ASPECT_LTITOOL_NODE))){
             generateLtiResourceLink = repositoryBaseUrl + "/rest/ltiplatform/v13/generateLoginInitiationFormResourceLink?nodeId=" + node.getRef().getId();
-            if(Context.getCurrentInstance() != null && Context.getCurrentInstance().getSessionAttribute(CCConstants.AUTH_SINGLE_USE_NODEIDS) != null){
+            if(Context.getCurrentInstance() != null){
                 if(Context.getCurrentInstance().isSingleUseNodeId(node.getRef().getId())){
                     //generate short living jwt
                     try {

diff --git a/Frontend/src/app/core-ui-module/render-helper.service.ts b/Frontend/src/app/core-ui-module/render-helper.service.ts
@@ -181,7 +181,11 @@ export class RenderHelperService {
     }
 
     private getCollectionsContainingNode(node: Node): Observable<Node[]> {
-        const id = this.getOriginalId(node);
+        let id = this.getOriginalId(node);
+        // a childobject can never be in a collection, but its parent may
+        if (node.aspects?.includes(RestConstants.CCM_ASPECT_IO_CHILDOBJECT)) {
+            id = node.parent?.id;
+        }
         return this.networkService.isFromHomeRepository(node).pipe(
             switchMap((home) => {
                 if (home) {