Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java =================================================================== diff -u -ra460ff0efcb1fcf15e490e4465809dc69b7f6e5a -rd88779815ecb8c0132b08fc1983ed6209ce35fea --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java (.../NbAuthoringAction.java) (revision a460ff0efcb1fcf15e490e4465809dc69b7f6e5a) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java (.../NbAuthoringAction.java) (revision d88779815ecb8c0132b08fc1983ed6209ce35fea) @@ -61,7 +61,7 @@ * * @struts:action path="/authoring" name="NbAuthoringForm" scope="session" * type="org.lamsfoundation.lams.tool.noticeboard.web.NbAuthoringAction" - * parameter="method" + * parameter="method" validate="false" * * @struts.action-exception key="error.exception.NbApplication" scope="request" * type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException" @@ -255,16 +255,16 @@ */ getToolContentHandler().deleteFile(file.getUuid()); - NodeKey node = getToolContentHandler().uploadFile(theFile.getInputStream(), theFile.getFileName(), + nbService.removeAttachment(file); + + /* NodeKey node = getToolContentHandler().uploadFile(theFile.getInputStream(), theFile.getFileName(), theFile.getContentType(), fileType); file.setUuid(node.getUuid()); //only need to update the uuid, the rest of the info is the same file.setVersionId(node.getVersion()); - nbService.saveAttachment(file); + nbService.saveAttachment(file); */ } - else - { /** * This is a new file and so is saved to the content repository. * @@ -279,8 +279,8 @@ file.setUuid(node.getUuid()); file.setVersionId(node.getVersion()); /** TODO: change versionId to version */ nbService.saveAttachment(file); - } + String keyName = file.returnKeyName(); //add the files to the map