Skip to content
Snippets Groups Projects
Commit 3f9bd6f3 authored by srosse's avatar srosse
Browse files

FXOLAT-296: for forums and folders, add the name of the course and the name of the course node

parent 9764fb10
No related branches found
No related tags found
No related merge requests found
......@@ -41,6 +41,8 @@ public class ForumVO {
@XmlAttribute(name="name", required=false)
private String name;
@XmlAttribute(name="detailsName", required=false)
private String detailsName;
@XmlAttribute(name="forumKey", required=false)
private Long forumKey;
@XmlAttribute(name="groupKey", required=false)
......@@ -68,6 +70,14 @@ public class ForumVO {
this.name = name;
}
public String getDetailsName() {
return detailsName;
}
public void setDetailsName(String detailsName) {
this.detailsName = detailsName;
}
public Long getForumKey() {
return forumKey;
}
......
......@@ -262,7 +262,8 @@ public class MyForumsWebService {
Forum forum = forumNode.loadOrCreateForum(course.getCourseEnvironment());
ForumVO forumVo = new ForumVO(forum);
forumVo.setName(forumNode.getShortTitle());
forumVo.setName(course.getCourseTitle());
forumVo.setDetailsName(forumNode.getShortTitle());
forumVo.setSubscribed(courseNotified.containsKey(entry.getKey()));
forumVo.setForumKey(courseNotified.get(entry.getKey()));
forumVo.setCourseKey(course.getResourceableId());
......
......@@ -39,6 +39,8 @@ public class FolderVO {
@XmlAttribute(name="name", required=false)
private String name;
@XmlAttribute(name="detailsName", required=false)
private String detailsName;
@XmlAttribute(name="groupKey", required=false)
private Long groupKey;
@XmlAttribute(name="courseKey", required=false)
......@@ -48,9 +50,6 @@ public class FolderVO {
@XmlAttribute(name="subscribed", required=false)
private boolean subscribed;
public String getName() {
return name;
}
......@@ -59,6 +58,14 @@ public class FolderVO {
this.name = name;
}
public String getDetailsName() {
return detailsName;
}
public void setDetailsName(String detailsName) {
this.detailsName = detailsName;
}
public Long getGroupKey() {
return groupKey;
}
......
......@@ -293,7 +293,8 @@ public class UserFoldersWebService {
if(mayAccessWholeTreeUp) {
FolderVO folderVo = new FolderVO();
folderVo.setName(bcNode.getShortTitle());
folderVo.setName(course.getCourseTitle());
folderVo.setDetailsName(bcNode.getShortTitle());
folderVo.setSubscribed(courseNotified.containsKey(bcNode.getIdent()));
folderVo.setCourseKey(course.getResourceableId());
folderVo.setCourseNodeId(bcNode.getIdent());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment