This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit e4784130c496b4af6abaf43e06bc5864f13a6ba7 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Tue May 26 10:57:56 2015 +0200 Fix logout problems --- swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp | 11 +++-------- .../src/main/webapp/WEB-INF/content/modificationViewer.jsp | 6 +++--- swe-ui-web/src/main/webapp/js/cancelRedirect.js | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp index cb8e4b9..5f625b4 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp @@ -33,13 +33,8 @@ <link rel="stylesheet" type="text/css" href="css/main.css"> - <% if (request.getAttribute("projectUrl") != null) { %> <meta http-equiv="Refresh" - content="0;URL=edit.action?address=<%=request.getAttribute("address")%>&projectUrl=<%=request.getAttribute("projectUrl")%>&scmType=<%=request.getAttribute("scmType")%>"> - <% } else { %> - <meta http-equiv="Refresh" - content="0;URL=edit.action?address=<%=request.getAttribute("address")%>&scmType=<%=request.getAttribute("scmType")%>"> - <% } %> + content="0;URL=edit.action?address=<%=request.getAttribute("address")%>&scmType=<%=request.getAttribute("scmType")%>&selectedBranch=<%=request.getParameter("selectedBranch")%>"> </head> @@ -49,8 +44,8 @@ <p><s:text name="scm.logoutWait"/><a - href="edit.action?address=<%=request.getAttribute("address")%>&scmType=<%=request.getAttribute("scmType")%>"> <s:text - name="scm.clickHere"/> </a>.</p> + href="edit.action?address=<%=request.getAttribute("address")%>&scmType=<%=request.getAttribute("scmType")%>&selectedBranch=<%=request.getParameter("selectedBranch")%>"> + <s:text name="scm.clickHere"/> </a>.</p> <p>©2004-2015 CodeLutin</p> </body> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp index 5bc5708..2ce2a99 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp @@ -176,11 +176,11 @@ <s:property value="address"/> </s:set> <s:set id="projectUrlDeco"> - <s:property value="projectUrl"/> + <s:property value="address"/> </s:set> <s:a id="logout" - href="logout.action?address=%{addressDeco}&projectUrl=%{projectUrlDeco}&scmType=%{scmType}" + href="logout.action?address=%{addressDeco}&projectUrl=%{projectUrlDeco}&scmType=%{scmType}&selectedBranch=%{selectedBranch}" title="Logout" > <div id="logoutButton"></div> @@ -293,7 +293,7 @@ <!-- BEGIN exit --> - <s:if test="projectUrl!=null"> + <s:if test="projectUrl != null"> <s:hidden key="projectUrl" label=''/> </s:if> <s:else> diff --git a/swe-ui-web/src/main/webapp/js/cancelRedirect.js b/swe-ui-web/src/main/webapp/js/cancelRedirect.js index 5465ea6..84f1c7a 100644 --- a/swe-ui-web/src/main/webapp/js/cancelRedirect.js +++ b/swe-ui-web/src/main/webapp/js/cancelRedirect.js @@ -24,7 +24,7 @@ function cancelRedirect(text, url) { if (confirm(text)){ - document.location.href=url.value; + document.location.href = url.value; } return false; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.