Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -rdecc127e5fc343f5cd178e0c6481b987be36a35e -r433558c547756edbd5d6e199e12be9a1ef090f36
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision decc127e5fc343f5cd178e0c6481b987be36a35e)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision 433558c547756edbd5d6e199e12be9a1ef090f36)
@@ -252,6 +252,7 @@
mcAuthoringForm.setMoveDown(null);
mcAuthoringForm.setAddOption(null);
mcAuthoringForm.setRemoveOption(null);
+ mcAuthoringForm.setViewFileItem(null);
String addQuestion=request.getParameter("addQuestion");
@@ -311,6 +312,14 @@
mcAuthoringForm.setRemoveOption("1");
}
+ String viewFileItem=request.getParameter("viewFileItem");
+ logger.debug("parameter viewFileItem" + viewFileItem);
+ if ((viewFileItem != null) && viewFileItem.equals("1"))
+ {
+ logger.debug("parameter viewFileItem is selected " + viewFileItem);
+ mcAuthoringForm.setViewFileItem("1");
+ }
+
String userAction=null;
if (mcAuthoringForm.getAddQuestion() != null)
@@ -1272,6 +1281,21 @@
request.getSession().setAttribute(CURRENT_TAB, new Long(3));
return (mapping.findForward(ALL_INSTRUCTIONS));
}
+ else if (mcAuthoringForm.getViewFileItem() != null)
+ {
+ userAction="viewFileItem";
+ request.setAttribute(USER_ACTION, userAction);
+ logger.debug("userAction:" + userAction);
+
+ String fileItem= request.getParameter("fileItem");
+ logger.debug("fileItem:" + fileItem);
+
+ mcAuthoringForm.resetUserAction();
+ request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(2));
+ logger.debug("setting EDIT_OPTIONS_MODE :" + 2);
+ request.getSession().setAttribute(CURRENT_TAB, new Long(3));
+ return (mapping.findForward(ALL_INSTRUCTIONS));
+ }
mcAuthoringForm.resetUserAction();
return (mapping.findForward(LOAD_QUESTIONS));
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java
===================================================================
diff -u -r57412c3df9867b1ccef773efe817994848c58870 -r433558c547756edbd5d6e199e12be9a1ef090f36
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java (.../McAuthoringForm.java) (revision 57412c3df9867b1ccef773efe817994848c58870)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java (.../McAuthoringForm.java) (revision 433558c547756edbd5d6e199e12be9a1ef090f36)
@@ -45,6 +45,9 @@
protected String advancedTabDone;
protected String instructionsTabDone;
+ protected String fileItem;
+ protected String viewFileItem;
+
protected String addContent;
protected String removeContent;
protected String removeAllContent;
@@ -116,6 +119,9 @@
this.moveDown=null;
this.moveUp=null;
+ this.fileItem=null;
+ this.viewFileItem=null;
+
this.addContent=null;
this.removeContent=null;
this.removeAllContent=null;
@@ -148,6 +154,9 @@
this.moveDown=null;
this.moveUp=null;
+ this.fileItem=null;
+ this.viewFileItem=null;
+
this.addContent=null;
this.removeContent=null;
this.removeAllContent=null;
@@ -858,4 +867,28 @@
public void setMoveUp(String moveUp) {
this.moveUp = moveUp;
}
+ /**
+ * @return Returns the fileItem.
+ */
+ public String getFileItem() {
+ return fileItem;
+ }
+ /**
+ * @param fileItem The fileItem to set.
+ */
+ public void setFileItem(String fileItem) {
+ this.fileItem = fileItem;
+ }
+ /**
+ * @return Returns the viewFileItem.
+ */
+ public String getViewFileItem() {
+ return viewFileItem;
+ }
+ /**
+ * @param viewFileItem The viewFileItem to set.
+ */
+ public void setViewFileItem(String viewFileItem) {
+ this.viewFileItem = viewFileItem;
+ }
}
Index: lams_tool_lamc/web/BasicContent.jsp
===================================================================
diff -u -rdecc127e5fc343f5cd178e0c6481b987be36a35e -r433558c547756edbd5d6e199e12be9a1ef090f36
--- lams_tool_lamc/web/BasicContent.jsp (.../BasicContent.jsp) (revision decc127e5fc343f5cd178e0c6481b987be36a35e)
+++ lams_tool_lamc/web/BasicContent.jsp (.../BasicContent.jsp) (revision 433558c547756edbd5d6e199e12be9a1ef090f36)
@@ -5,7 +5,7 @@
<%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
<%@ taglib uri="fck-editor" prefix="FCK" %>
-