Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v
diff -u -r1.46 -r1.47
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 22 Mar 2013 10:33:55 -0000 1.46
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 26 Mar 2013 18:24:02 -0000 1.47
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.58 -r1.59
--- lams_central/web/main.jsp 19 Mar 2013 12:16:22 -0000 1.58
+++ lams_central/web/main.jsp 26 Mar 2013 18:24:02 -0000 1.59
@@ -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() {