diff --git a/src/main/java/org/olat/restapi/group/LearningGroupWebService.java b/src/main/java/org/olat/restapi/group/LearningGroupWebService.java index e0f110b1f4036edbd938b4d2f2ac184bb1cd655e..deaf98c3f9fe0b87dd3872f58b05675d07921316 100644 --- a/src/main/java/org/olat/restapi/group/LearningGroupWebService.java +++ b/src/main/java/org/olat/restapi/group/LearningGroupWebService.java @@ -21,6 +21,7 @@ package org.olat.restapi.group; import static org.olat.restapi.security.RestSecurityHelper.isGroupManager; +import static org.olat.restapi.support.ObjectFactory.getInformation; import java.util.ArrayList; import java.util.Collections; @@ -70,7 +71,6 @@ import org.olat.group.BusinessGroupManagerImpl; import org.olat.group.properties.BusinessGroupPropertyManager; import org.olat.group.ui.BGConfigFlags; import org.olat.modules.fo.Forum; -import org.olat.modules.fo.ForumManager; import org.olat.modules.fo.restapi.ForumWebService; import org.olat.restapi.security.RestSecurityHelper; import org.olat.restapi.support.ObjectFactory; @@ -285,29 +285,7 @@ public class LearningGroupWebService { } } - GroupInfoVO info = new GroupInfoVO(); - - //forum - CollaborationTools collabTools = CollaborationToolsFactory.getInstance().getOrCreateCollaborationTools(bg); - if(collabTools.isToolEnabled(CollaborationTools.TOOL_FORUM)) { - info.setForumKey(collabTools.getForum().getKey()); - } - - String news = collabTools.lookupNews(); - info.setNews(news); - - if (collabTools.isToolEnabled(CollaborationTools.TOOL_WIKI)) { - info.setHasWiki(Boolean.TRUE); - } else { - info.setHasWiki(Boolean.FALSE); - } - - if (collabTools.isToolEnabled(CollaborationTools.TOOL_FOLDER)) { - info.setHasFolder(Boolean.TRUE); - } else { - info.setHasFolder(Boolean.FALSE); - } - + GroupInfoVO info = getInformation(bg); return Response.ok(info).build(); } diff --git a/src/main/java/org/olat/restapi/support/ObjectFactory.java b/src/main/java/org/olat/restapi/support/ObjectFactory.java index 17fa652bf904581feb4091263997b20ba8498a00..05d670c3b5485d184372f87d2cf2e01a6d1f808b 100644 --- a/src/main/java/org/olat/restapi/support/ObjectFactory.java +++ b/src/main/java/org/olat/restapi/support/ObjectFactory.java @@ -122,6 +122,7 @@ public class ObjectFactory { public static CourseVO get(RepositoryEntry re, ICourse course) { CourseVO vo = new CourseVO(); vo.setKey(course.getResourceableId()); + vo.setDisplayName(re.getDisplayname()); vo.setTitle(course.getCourseTitle()); vo.setEditorRootNodeId(course.getEditorTreeModel().getRootNode().getIdent()); vo.setSoftKey(re.getSoftkey()); diff --git a/src/main/java/org/olat/restapi/support/vo/CourseVO.java b/src/main/java/org/olat/restapi/support/vo/CourseVO.java index 2f0474cb32cb57c7e43a7440cccb1d5a2264b366..bfe2dbe90d753263cfe0a6232c04385d909a1d4f 100644 --- a/src/main/java/org/olat/restapi/support/vo/CourseVO.java +++ b/src/main/java/org/olat/restapi/support/vo/CourseVO.java @@ -45,6 +45,7 @@ public class CourseVO { private String softKey; private Long repoEntryKey; private String title; + private String displayName; private String editorRootNodeId; @@ -87,6 +88,14 @@ public class CourseVO { this.title = title; } + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + public String getEditorRootNodeId() { return editorRootNodeId; } diff --git a/src/main/java/org/olat/restapi/support/vo/Examples.java b/src/main/java/org/olat/restapi/support/vo/Examples.java index cd81ed4365af444540726baa93248d5a9caff056..6d91b835bec9203be12e30cfbdd175b579671e78 100644 --- a/src/main/java/org/olat/restapi/support/vo/Examples.java +++ b/src/main/java/org/olat/restapi/support/vo/Examples.java @@ -98,6 +98,7 @@ public class Examples { SAMPLE_KEYVALUEVOes.getPairs().add(SAMPLE_KEYVALUEVO); SAMPLE_COURSEVO.setKey(777l); + SAMPLE_COURSEVO.setDisplayName("Demo course"); SAMPLE_COURSEVO.setTitle("Demo course"); SAMPLE_COURSEVOes.setTotalCount(0); SAMPLE_COURSEVOes.setCourses(new CourseVO[]{SAMPLE_COURSEVO});