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

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

Revision: 734
          http://treebase.svn.sourceforge.net/treebase/?rev=734&view=rev
Author:   youjun
Date:     2010-07-15 00:13:45 +0000 (Thu, 15 Jul 2010)

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


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

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudyFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudyFormController.java	2010-07-14 20:45:11 UTC (rev 733)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudyFormController.java	2010-07-15 00:13:45 UTC (rev 734)
@@ -105,7 +105,7 @@
 		Study study = (Study) command;
 		User user = ControllerUtil.getUser(request, mUserService);
 		String importKey = (String)request.getSession().getAttribute("importKey");
-		request.getSession().removeAttribute("importKey");
+		//request.getSession().removeAttribute("importKey");
 		
 		if(importKey != null && importKey.length()>0){
 			String uploadpath = getServletContext()

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/loginForm.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/loginForm.jsp	2010-07-14 20:45:11 UTC (rev 733)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/loginForm.jsp	2010-07-15 00:13:45 UTC (rev 734)
@@ -2,14 +2,14 @@
 
 <form method="post" id="loginForm" action="<c:url value="/j_security_check"/>" >
 
-<!-- 
+
 <% 
 	if(request.getParameter("importKey") != null){
 
        session.setAttribute("importKey",request.getParameter("importKey"));
 	}
 %>
--->
+
  
 <fieldset>
 <legend>Login</legend>


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