Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -r36dd2823903c77fa92c86c250184cc96a932c383 -rf6359207eef0f47bdd53b51c0b73aea8ec236b64
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 36dd2823903c77fa92c86c250184cc96a932c383)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision f6359207eef0f47bdd53b51c0b73aea8ec236b64)
@@ -53,7 +53,6 @@
import org.jdom.JDOMException;
import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
import org.lamsfoundation.lams.learningdesign.GroupUser;
-import org.lamsfoundation.lams.learningdesign.LearningDesign;
import org.lamsfoundation.lams.learningdesign.dao.IGroupUserDAO;
import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService;
import org.lamsfoundation.lams.lesson.Lesson;
@@ -460,7 +459,7 @@
} else {
WorkspaceFolder folder = getWorkspaceManagementService().getWorkspaceFolder(folderID);
folderContents = getWorkspaceManagementService().getFolderContents(userID, folder,
- WorkspaceManagementService.AUTHORING);
+ WorkspaceManagementService.MONITORING);
Collections.sort(folderContents, HomeAction.LD_NAME_COMPARATOR);
}
@@ -474,16 +473,10 @@
WorkspaceFolder.RUN_SEQUENCES.equals(folderContent.getResourceTypeID().intValue()));
result.append("folders", subfolder);
} else if (FolderContentDTO.DESIGN.equals(contentType)) {
- Long learningDesignID = folderContent.getResourceID();
- LearningDesign learningDesign = (LearningDesign) getService().findById(LearningDesign.class,
- learningDesignID);
- // use only valid designs
- if (learningDesign != null && learningDesign.getValidDesign()) {
- JSONObject learningDesignJSON = new JSONObject();
- learningDesignJSON.put("learningDesignId", learningDesignID);
- learningDesignJSON.put("name", folderContent.getName());
- result.append("learningDesigns", learningDesignJSON);
- }
+ JSONObject learningDesignJSON = new JSONObject();
+ learningDesignJSON.put("learningDesignId", folderContent.getResourceID());
+ learningDesignJSON.put("name", folderContent.getName());
+ result.append("learningDesigns", learningDesignJSON);
} else {
if (HomeAction.log.isDebugEnabled()) {
HomeAction.log.debug("Unsupported folder content found, named \"" + folderContent.getName() + "\"");
Index: lams_central/web/main.jsp
===================================================================
diff -u -r76aaa4283f0c9c4b95cae2104bdf453c02ee7721 -rf6359207eef0f47bdd53b51c0b73aea8ec236b64
--- lams_central/web/main.jsp (.../main.jsp) (revision 76aaa4283f0c9c4b95cae2104bdf453c02ee7721)
+++ lams_central/web/main.jsp (.../main.jsp) (revision f6359207eef0f47bdd53b51c0b73aea8ec236b64)
@@ -122,7 +122,7 @@
'hide' : 'fold',
'open' : function(){
// load contents after opening the dialog
- $('#addLessonFrame').attr('src', 'home.do?method=addLesson&organisationID='
+ $('#addLessonFrame').prop('src', 'home.do?method=addLesson&organisationID='
+ $(this).dialog('option', 'orgID'));
},
'close' : function() {
@@ -145,7 +145,7 @@
'hide' : 'fold',
'open' : function(){
// load contents after opening the dialog
- $('#monitorFrame').attr('src', 'monitoring/monitoring.do?method=monitorLesson&lessonID='
+ $('#monitorFrame').prop('src', 'monitoring/monitoring.do?method=monitorLesson&lessonID='
+ $(this).dialog('option', 'lessonID'));
},
'close' : function() {