Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java
===================================================================
diff -u -r4aae0391a4892385de3df761a655e0ab8b1c0183 -rdbdc5aaa161dcc6dbb71ddf0538920a7f7c98a07
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java (.../NbAuthoringForm.java) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java (.../NbAuthoringForm.java) (revision dbdc5aaa161dcc6dbb71ddf0538920a7f7c98a07)
@@ -280,42 +280,6 @@
nbContent.setDateUpdated(new Date(System.currentTimeMillis()));
}
- public ActionErrors validate(ActionMapping mapping, HttpServletRequest request)
- {
- ActionErrors errors = new ActionErrors();
- //check the tool content id
- //check the title and instructions
-
- float maxFileSize = UploadFileUtil.getMaxFileSize();
-
- if (this.offlineFile != null && offlineFile.getFileSize()!= 0)
- {
- float sizeOfOfflineUpload = offlineFile.getFileSize() / 1024 / 1024;
- //check the file size
- if (sizeOfOfflineUpload > maxFileSize)
- {
- logger.error("file size " + sizeOfOfflineUpload + " Max File Size allowed: " + maxFileSize);
- errors.add("filesize", new ActionMessage("error.exceedMaxFileSize"));
- this.setMethod("Instructions");
- }
-
- }
- else if ( this.onlineFile != null && onlineFile.getFileSize() != 0)
- {
- float sizeOfOnlineUpload = onlineFile.getFileSize() / 1024 / 1024; //getFileSize() returns the file size in bytes, but we are comparing the filesize using units MBs
-
- if (sizeOfOnlineUpload > maxFileSize)
- {
-
- logger.error("file size " + sizeOfOnlineUpload + " Max File Size allowed: " + maxFileSize);
- errors.add("filesize", new ActionMessage("error.exceedMaxFileSize"));
- this.setMethod("Instructions");
- }
- }
-
- return errors;
-
- }
public String getCurrentTab() {
return currentTab;
}
Index: lams_tool_nb/web/META-INF/MANIFEST.MF
===================================================================
diff -u -ra766c8fe51dfa314947b20ef98e525d63b328fbe -rdbdc5aaa161dcc6dbb71ddf0538920a7f7c98a07
--- lams_tool_nb/web/META-INF/MANIFEST.MF (.../MANIFEST.MF) (revision a766c8fe51dfa314947b20ef98e525d63b328fbe)
+++ lams_tool_nb/web/META-INF/MANIFEST.MF (.../MANIFEST.MF) (revision dbdc5aaa161dcc6dbb71ddf0538920a7f7c98a07)
@@ -1,3 +1,5 @@
-Manifest-Version: 1.0
+Implementation-Title: LAMS - Noticeboard Tool
+Implementation-Version: 2.0 RC1
+Implementation-Vendor: LAMS Foundation (http://lamsfoundation.org)
Class-Path:
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
diff -u -r76f7b5fee0d226d36814affd2b6888ff605ee08b -rdbdc5aaa161dcc6dbb71ddf0538920a7f7c98a07
--- lams_tool_nb/web/authoring/authoring.jsp (.../authoring.jsp) (revision 76f7b5fee0d226d36814affd2b6888ff605ee08b)
+++ lams_tool_nb/web/authoring/authoring.jsp (.../authoring.jsp) (revision dbdc5aaa161dcc6dbb71ddf0538920a7f7c98a07)
@@ -37,13 +37,17 @@
return true;
}
- function deleteAttachment(dispatch, uuid) {
- document.authoringForm.dispatch.value = dispatch;
- document.authoringForm.deleteFileUuid.value = uuid;
- document.authoringForm.submit();
+ function deleteAttachment(uuid) {
+ document.NbAuthoringForm.method.value = '';
+ document.NbAuthoringForm.deleteFileUuid.value = uuid;
+ document.NbAuthoringForm.submit();
}
-
+ function doUpload() {
+ document.NbAuthoringForm.method.value = '';
+ document.NbAuthoringForm.submit();
+ }
+
@@ -57,8 +61,7 @@
+ value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
Index: lams_tool_nb/web/authoring/instructions.jsp
===================================================================
diff -u -r76f7b5fee0d226d36814affd2b6888ff605ee08b -rdbdc5aaa161dcc6dbb71ddf0538920a7f7c98a07
--- lams_tool_nb/web/authoring/instructions.jsp (.../instructions.jsp) (revision 76f7b5fee0d226d36814affd2b6888ff605ee08b)
+++ lams_tool_nb/web/authoring/instructions.jsp (.../instructions.jsp) (revision dbdc5aaa161dcc6dbb71ddf0538920a7f7c98a07)
@@ -10,6 +10,7 @@
+
@@ -47,7 +48,7 @@
+ href="javascript:deleteAttachment('${attachment.uuid}')">
@@ -69,9 +70,10 @@
|
-
+
-
+
|
@@ -113,7 +115,7 @@
+ href="javascript:deleteAttachment('${attachment.uuid}')">
@@ -135,9 +137,10 @@
|
-
+
-
+
|