r244 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions webapp/WEB-INF/content - Scmwebeditor-commits

25 Aug 2011

Author: kcardineaud
Date: 2011-08-25 15:46:34 +0200 (Thu, 25 Aug 2011)
New Revision: 244

Url: http://nuiton.org/repositories/revision/scmwebeditor/244

Log:
Fix an issue with logout

Modified:
   trunk/src/main/java/org/nuiton/scmwebeditor/actions/LogoutAction.java
   trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java
   trunk/src/main/webapp/WEB-INF/content/logout.jsp
   trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp

Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/LogoutAction.java
===================================================================

--- trunk/src/main/java/org/nuiton/scmwebeditor/actions/LogoutAction.java	2011-08-25 13:46:02 UTC (rev 243)
+++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/LogoutAction.java	2011-08-25 13:46:34 UTC (rev 244)
@@ -44,6 +44,7 @@
     private static final Log log = LogFactory.getLog(LogoutAction.class);
     
     protected String address;
+    protected String projectUrl;
     
     protected HttpServletRequest request;
     protected HttpServletResponse response;
@@ -57,9 +58,16 @@
         return address;
     }
 
+    public String getProjectUrl() {
+        return projectUrl;
+    }
 
+    public void setProjectUrl(String projectUrl) {
+        this.projectUrl = projectUrl;
+    }   
+
     public String execute() {
-        
+
         SvnConnection svnConn = new SvnConnection(address);
         
         //Si le repo n'est pas protege en ecriture on recupere sont UUID

Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java
===================================================================
--- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java	2011-08-25 13:46:02 UTC (rev 243)
+++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java	2011-08-25 13:46:34 UTC (rev 244)
@@ -207,7 +207,7 @@
 //        }
         
         
-        if(!this.fromLoginPage) {
+        if(!this.fromLoginPage && projectUrl==null) {
             projectUrl=request.getHeader("referer");
         }
         

Modified: trunk/src/main/webapp/WEB-INF/content/logout.jsp
===================================================================
--- trunk/src/main/webapp/WEB-INF/content/logout.jsp	2011-08-25 13:46:02 UTC (rev 243)
+++ trunk/src/main/webapp/WEB-INF/content/logout.jsp	2011-08-25 13:46:34 UTC (rev 244)
@@ -34,12 +34,20 @@
 <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="css/main.css">
 
+
+<% if(request.getAttribute("projectUrl")!=null) { %>
+<meta http-equiv="Refresh" content="0;URL=checkout.action?address=<%=request.getAttribute("address")%>&projectUrl=<%=request.getAttribute("projectUrl")%>">
+<% } else { %>
 <meta http-equiv="Refresh" content="0;URL=checkout.action?address=<%=request.getAttribute("address")%>">
+<% } %>
 
+
 </head>
 <body>
 <a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a>
 
+
+
 <p>Logout... <a href="checkout.action?address=<%=request.getAttribute("address")%>"> <s:text name="scm.clickHere" /> </a>.</p>
 <p>©2004-2009 CodeLutin</p>
 </body>

Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp
===================================================================
--- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp	2011-08-25 13:46:02 UTC (rev 243)
+++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp	2011-08-25 13:46:34 UTC (rev 244)
@@ -114,10 +114,13 @@
       
             <s:set id="addressDeco">
                 <s:property value="address"/>
+            </s:set>
+            <s:set id="projectUrlDeco">
+                <s:property value="projectUrl"/>
             </s:set> 
             <s:a 
                 id="logout" 
-                href="logout.action?address=%{addressDeco}" 
+                href="logout.action?address=%{addressDeco}&projectUrl=%{projectUrlDeco}" 
                 title="Logout"
                >
                 <div id="logoutButton" ></div>
@@ -231,6 +234,13 @@
 		     
 		     <!-- BEGIN exit -->
 		     
+		        <% if(request.getAttribute("projectUrl")!=null) { %>
+			         <input type="hidden" id="projectUrl" value="<%=request.getAttribute("projectUrl")%>"  />
+			    <% } else { %>
+			         <input type="hidden" id="projectUrl" value="checkout.action"  />
+			    <% } %>
+		     
+		     
 		        <s:set id="scm.exitTitle">
 			        <s:text name="scm.exitTitle"/>
 			    </s:set>
@@ -243,7 +253,7 @@
 			      title="%{scm.exitTitle}" 
 			      value="%{scm.exit}" 
 			      name="Cancel"
-			      onclick="return cancelRedirect('%{scm.exitJavascript}',document.getElementById('ProjectUrl'));">
+			      onclick="return cancelRedirect('%{scm.exitJavascript}',document.getElementById('projectUrl'));">
 			     <div id="exitButton" ></div>
 			     </s:a>
 		     
@@ -365,14 +375,6 @@
 
     
     
-    
-    
-    <% if(request.getAttribute("projectUrl")!=null) { %>
-    <input type="hidden" id="ProjectUrl" value="<%=request.getAttribute("projectUrl")%>"  />
-    <% } else { %>
-    <input type="hidden" id="ProjectUrl" value="checkout.action"  />
-    <% } %>
-    
    
     </div>

    

r244 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions webapp/WEB-INF/content

kcardineaud＠users.nuiton.org

tags

participants (1)