Author: kcardineaud Date: 2011-08-10 15:01:51 +0200 (Wed, 10 Aug 2011) New Revision: 210 Url: http://nuiton.org/repositories/revision/scmwebeditor/210 Log: Fix an issue when login fail Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmSession.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmSession.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmSession.java 2011-08-09 13:56:44 UTC (rev 209) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmSession.java 2011-08-10 13:01:51 UTC (rev 210) @@ -20,6 +20,10 @@ scmUsers.put(address, new ScmUser(login,password)); } + public void delScmUser(String address) { + scmUsers.remove(address); + } + public String getUsername(String url) { if(scmUsers.containsKey(url)) { return scmUsers.get(url).getUsername(); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-08-09 13:56:44 UTC (rev 209) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-08-10 13:01:51 UTC (rev 210) @@ -40,7 +40,7 @@ protected String pw; protected String address; protected String lastText; - protected String fileType; + protected String format; protected String projectUrl; protected boolean force; @@ -63,12 +63,12 @@ return newText; } - public String getFileType() { - return fileType; + public String getFormat() { + return format; } - public void setFileType(String fileType) { - this.fileType = fileType; + public void setFormat(String format) { + this.format = format; } public void setNewText(String newText) { @@ -152,7 +152,7 @@ public String execute() { if(!force) { - if(fileType.equals("rst")) { + if(format.equals("rst")) { if(!testRstParsing(newText)) { return "errorRst"; } @@ -226,8 +226,11 @@ //On supprime le repertoire temporaire delTempDirectory(checkoutdir); //redirect to a login page - return Action.LOGIN; + getScmSession().delScmUser(repositoryUUID); + + return Action.LOGIN; + } catch (SVNException e) { //Suppression du repertoire temporaire delTempDirectory(checkoutdir); @@ -304,6 +307,9 @@ request.setAttribute(ATTRIBUTE_BAD_LOGIN, true); //Suppression du repertoire temporaire delTempDirectory(checkoutdir); + + //on supprime la valeur stocke en session + getScmSession().delScmUser(repositoryUUID); return Action.LOGIN; } catch (SVNException e) { if(log.isErrorEnabled()) { Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-09 13:56:44 UTC (rev 209) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-10 13:01:51 UTC (rev 210) @@ -66,16 +66,14 @@ <form method="POST" action="commit.action?force=true" id="editForm"> - <% - if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")){ + + <% + if (request.getAttribute("format")!=null){ %> - <input type="hidden" name="fileType" value="rst" /> - <% } else { %> - <input type="hidden" name="fileType" value="other" /> + <input type="hidden" name="format" value="<%=request.getAttribute("format")%>" /> <% } %> - <% String valueTextarea; if(request.getAttribute("lastText")!=null) { @@ -137,7 +135,15 @@ <div id="form"> - <div id="htmlcontentCommit"></div> + <div id="htmlcontentCommit"> + <%if (request.getAttribute("badLogin")!=null && request.getAttribute("badLogin").equals(true)) { %> + <p> + <font color="red"> + Bad username or password + </font> + </p> + <%} %> + </div> <s:set id="scm.commitMessage"> <s:text name="scm.commitMessage"/> @@ -149,13 +155,7 @@ <s:textfield required="true" label="%{scm.commitMessage}" name="commitMessage" title="%{scm.commitMessageTitle}" /> - <%if (request.getAttribute("badLogin")!=null && request.getAttribute("badLogin").equals(true)) { %> - <p> - <font color="red"> - Bad username or password - </font> - </p> - <% } %> + <p>