branch develop updated (7315fb4 -> 9202641)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from 7315fb4 Change some icons which were too similar new 9202641 Fix the revision number update at commit The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 920264177c22a14b88ec777b5dac0d5490c49992 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri Jun 19 16:06:37 2015 +0200 Fix the revision number update at commit Summary of changes: .../src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java | 8 ++++++++ swe-ui-web/src/main/webapp/WEB-INF/content/save.jsp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 920264177c22a14b88ec777b5dac0d5490c49992 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri Jun 19 16:06:37 2015 +0200 Fix the revision number update at commit --- .../src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java | 8 ++++++++ swe-ui-web/src/main/webapp/WEB-INF/content/save.jsp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java index 5b070c9..5686491 100644 --- a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java +++ b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java @@ -410,6 +410,14 @@ public class GitConnection implements ScmConnection { } } + try { + resultDto.setNumRevision(getHeadRevisionNumber(dto.getAddress(), dto.getUsername(), dto.getPassword())); + } catch (AuthenticationException e) { + if (log.isErrorEnabled()) { + log.error("Auth fail", e); + } + } + return resultDto; } diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/save.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/save.jsp index af0199a..f848c80 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/save.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/save.jsp @@ -106,7 +106,7 @@ <script type="text/javascript"> origText = document.getElementById("origText"); origText.value = document.getElementById("lastRev").value; - var numrev = <s:property value="numRevision" />; + var numrev = '<s:property value="numRevision" />'; if (numrev != null) { document.getElementById('numrevisionDiv').innerHTML = numrev; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm