[Treebase-guts] SF.net SVN: treebase:[738] trunk/treebase-web/src/main

[<yo...@us...>]

Revision: 738
          http://treebase.svn.sourceforge.net/treebase/?rev=738&view=rev
Author:   youjun
Date:     2010-07-16 02:32:08 +0000 (Fri, 16 Jul 2010)

Log Message:
-----------


Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionList.jsp

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java	2010-07-16 01:36:17 UTC (rev 737)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java	2010-07-16 02:32:08 UTC (rev 738)
@@ -70,14 +70,14 @@
 			File uploadDir=new File(uploadpath);
 			if(!uploadDir.exists()){
 				importStatus = "NOT FOUND";
-				request.setAttribute("importStatus", importStatus);
+				request.getSession().setAttribute("importStatus", importStatus);
 				return new ModelAndView("redirect:/user/submissionList.html");
 			}
 			
 			File[] uploadFiles = uploadDir.listFiles(new FileFilter(){public boolean accept(File file){return file.isDirectory();}}); 			
 			if(uploadFiles.length==0){
 				importStatus = "NOT FOUND";
-				request.setAttribute("importStatus", importStatus);
+				request.getSession().setAttribute("importStatus", importStatus);
 				return new ModelAndView("redirect:/user/submissionList.html");
 			}
 			File bagitPath = uploadFiles[0];
@@ -108,7 +108,7 @@
 					importStatus = "FAILED";
 			}
 			
-			request.setAttribute("importStatus", importStatus);
+			request.getSession().setAttribute("importStatus", importStatus);
 			request.getSession().removeAttribute("importKey");			
 			return new ModelAndView("redirect:/user/submissionList.html");
 			

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionList.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionList.jsp	2010-07-16 01:36:17 UTC (rev 737)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionList.jsp	2010-07-16 02:32:08 UTC (rev 738)
@@ -105,14 +105,14 @@
 </display:table>
 </fieldset>
 <fieldset>
-<legend>Dryad Import Result
+<legend>Dryad Import Result: 
 <a href="#" class="openHelp" onclick="openHelp('dryadImport')"><img class="iconButton" src="<fmt:message key="icons.help"/>" /></a>	
 </legend>		
 			<div align="center">		
             	<c:choose>
-		   			<c:when test="${importStatus =='NOT FOUND'}"><c:out value="Sorry, we cannot find your data"/></c:when>
-		   			<c:when test="${importStatus =='OK'}"><c:out value="Import finished"/></c:when>
-		   			<c:when test="${importStatus =='FAILED'}"><c:out value="Sorry, One or more data file cannot parsed correctly, you may add your data via treebase interfaces"/></c:when>        
+		   			<c:when test="${sessionScope.importStatus =='NOT FOUND'}"><c:out value="Sorry, we cannot find your data"/></c:when>
+		   			<c:when test="${sessionScope.importStatus =='OK'}"><c:out value="Import finished"/></c:when>
+		   			<c:when test="${sessionScope.importStatus =='FAILED'}"><c:out value="Sorry, One or more data file cannot parsed correctly, you may add your data via treebase interfaces"/></c:when>        
 				</c:choose>	   	
 		   	</div>		
 </fieldset>			


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.