branch develop updated (7bbd807 -> 41e0c9f)
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 7bbd807 Add the ability to remove a directory from the repository new 41e0c9f Add a confirmation message when removing a file or a directory from the repository 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 41e0c9f7688d03e1f016dfec388fdcac60fa4624 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Thu May 28 10:45:06 2015 +0200 Add a confirmation message when removing a file or a directory from the repository Summary of changes: .../scmwebeditor/uiweb/actions/RemoveDirectoryAction.java | 2 -- .../main/resources/i18n/scmwebeditor-ui-web_en_GB.properties | 2 ++ .../main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties | 2 ++ .../main/webapp/WEB-INF/content/popups/createBranchForm.jsp | 1 - .../webapp/WEB-INF/content/popups/createDirectoryForm.jsp | 1 - .../webapp/WEB-INF/content/popups/removeDirectoryForm.jsp | 11 +++++++---- .../src/main/webapp/WEB-INF/content/popups/removeForm.jsp | 10 +++++++--- .../src/main/webapp/WEB-INF/content/popups/uploadForm.jsp | 1 - 8 files changed, 18 insertions(+), 12 deletions(-) -- 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 41e0c9f7688d03e1f016dfec388fdcac60fa4624 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Thu May 28 10:45:06 2015 +0200 Add a confirmation message when removing a file or a directory from the repository --- .../scmwebeditor/uiweb/actions/RemoveDirectoryAction.java | 2 -- .../main/resources/i18n/scmwebeditor-ui-web_en_GB.properties | 2 ++ .../main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties | 2 ++ .../main/webapp/WEB-INF/content/popups/createBranchForm.jsp | 1 - .../webapp/WEB-INF/content/popups/createDirectoryForm.jsp | 1 - .../webapp/WEB-INF/content/popups/removeDirectoryForm.jsp | 11 +++++++---- .../src/main/webapp/WEB-INF/content/popups/removeForm.jsp | 10 +++++++--- .../src/main/webapp/WEB-INF/content/popups/uploadForm.jsp | 1 - 8 files changed, 18 insertions(+), 12 deletions(-) diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/RemoveDirectoryAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/RemoveDirectoryAction.java index c8d697a..ffed038 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/RemoveDirectoryAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/RemoveDirectoryAction.java @@ -27,9 +27,7 @@ import org.apache.struts2.interceptor.ServletRequestAware; import org.nuiton.scmwebeditor.api.ScmConnection; import org.nuiton.scmwebeditor.api.ScmProvider; import org.nuiton.scmwebeditor.api.ScmWebEditorConfig; -import org.nuiton.scmwebeditor.api.dto.CreateDirectoryDto; import org.nuiton.scmwebeditor.api.dto.RemoveDirectoryDto; -import org.nuiton.scmwebeditor.api.dto.result.CreateDirectoryResultDto; import org.nuiton.scmwebeditor.api.dto.result.RemoveDirectoryResultDto; import javax.servlet.http.HttpServletRequest; diff --git a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_en_GB.properties b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_en_GB.properties index fe67464..c258af4 100644 --- a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_en_GB.properties +++ b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_en_GB.properties @@ -62,9 +62,11 @@ scm.privateScmAccess=You try to access a Private SCM. Please login scm.redirection=Redirection... scm.remove.file=Removing file\: scm.removeDirectory=Remove a directory +scm.removeDirectoryConfirm=Are you sure that you want to remove the directory scm.removeDirectorySuccess=Directory removal successful scm.removeDirectoryTitle=Remove a directory from the repository scm.removeFile=Remove a file +scm.removeFileConfirm=Are you sure that you want to remove the file scm.removeFileTitle=Remove a file from the repository scm.removeSuccess=File removal successful scm.repoError=Error on repository diff --git a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties index ede494a..bc053ca 100644 --- a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties +++ b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties @@ -62,9 +62,11 @@ scm.privateScmAccess=Pour modifier ce fichier, veuillez vous connecter. scm.redirection=Redirection... scm.remove.file=Suppression du fichier \: scm.removeDirectory=Supprimer un répertoire +scm.removeDirectoryConfirm=Êtes-vous sûr de vouloir supprimer le répertoire scm.removeDirectorySuccess=Répertoire supprimé avec succès scm.removeDirectoryTitle=Supprimer un répertoire du dépôt scm.removeFile=Supprimer un fichier +scm.removeFileConfirm=Êtes-vous sûr de vouloir supprimer le fichier scm.removeFileTitle=Supprimer un fichier du dépôt scm.removeSuccess=Suppression effectuée avec succès scm.repoError=Erreur sur le dépôt diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createBranchForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createBranchForm.jsp index c5cc7d8..07f3b20 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createBranchForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createBranchForm.jsp @@ -35,7 +35,6 @@ <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> - </head> <body> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createDirectoryForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createDirectoryForm.jsp index 9f04c8b..4ae8969 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createDirectoryForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createDirectoryForm.jsp @@ -35,7 +35,6 @@ <link rel="stylesheet" type="text/css" href="css/main.css"> <link rel="stylesheet" type="text/css" href="css/uploadForm.css"> <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> - <script type="text/javascript" src="js/branches.js"></script> </head> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeDirectoryForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeDirectoryForm.jsp index 2afe41f..1aa0a5e 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeDirectoryForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeDirectoryForm.jsp @@ -35,8 +35,6 @@ <link rel="stylesheet" type="text/css" href="css/main.css"> <link rel="stylesheet" type="text/css" href="css/uploadForm.css"> <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> - <script type="text/javascript" src="js/branches.js"></script> - </head> <body> @@ -73,11 +71,16 @@ } }); + function confirmRemove() { + var fileName = document.getElementById("directoryToRemove").value; + + return confirm('<s:text name="scm.removeDirectoryConfirm"/> ' + fileName + " ?"); + } + </script> -<form method="POST" id="removeDirectoryForm" action="doRemoveDirectory.action" - enctype="multipart/form-data"> +<form method="POST" id="removeDirectoryForm" action="doRemoveDirectory.action" onsubmit="return confirmRemove();"> <s:hidden name="scmType" value="%{scmType}"/> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeForm.jsp index 3c8a0a4..4316b8d 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeForm.jsp @@ -34,8 +34,6 @@ <title><s:text name="scm.removeFile"/></title> <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> - <script type="text/javascript" src="js/branches.js"></script> - </head> <body> @@ -73,10 +71,16 @@ } }); + function confirmRemove() { + var fileName = document.getElementById("scmPath").value; + + return confirm('<s:text name="scm.removeFileConfirm"/> ' + fileName + " ?"); + } + </script> -<form method="POST" id="removeForm" action="doRemove.action"> +<form method="POST" id="removeForm" action="doRemove.action" onsubmit="return confirmRemove();"> <s:hidden name="scmType" value="%{scmType}"/> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadForm.jsp index f383145..c55c686 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadForm.jsp @@ -35,7 +35,6 @@ <link rel="stylesheet" type="text/css" href="css/main.css"> <link rel="stylesheet" type="text/css" href="css/uploadForm.css"> <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> - <script type="text/javascript" src="js/branches.js"></script> </head> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm