From: Olivier Lamy Date: Mon, 16 Jan 2012 16:54:20 +0000 (+0000) Subject: [MRM-1574] delete managed repository X-Git-Tag: archiva-1.4-M3~1570 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=14438ff94785a158a7ee4531e7725e0cdb07af3b;p=archiva.git [MRM-1574] delete managed repository TODO ask for delete content ! git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1232063 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties index 22d52654e..a3da7d21d 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties @@ -19,3 +19,12 @@ # -------------------------------------------------------------------- # Archiva webapp i18n default en file # -------------------------------------------------------------------- + +#default common +id=id +warning.not.undone.operation=WARNING: This operation can not be undone. + +# managed repositories screen +managedrepository.delete.confirm=Delete Managed Repository +managedrepository.delete.warning.message=Are you sure you want to delete the following managed repository? +managedrepository.deleted=Managed Repository " {0} " deleted. \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js index 45bfff926..69b4dfecc 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js @@ -65,6 +65,8 @@ $(function() { //private boolean stageRepoNeeded; this.stageRepoNeeded=ko.observable(stageRepoNeeded); + + } ManagedRepositoryViewModel=function(managedRepository, update, managedRepositoriesViewModel){ @@ -151,6 +153,40 @@ $(function() { activateManagedRepositoryFormValidation(); } + removeManagedRepository=function(managedRepository){ + clearUserMessages(); + openDialogConfirm( + function(){ + var url = "restServices/archivaServices/managedRepositoriesService/deleteManagedRepository?"; + url += "repositoryId="+encodeURIComponent(managedRepository.id()); + url += "&deleteContent=false"; + $.ajax(url, + { + type: "GET", + success: function(data) { + self.managedRepositories.remove(managedRepository); + displaySuccessMessage($.i18n.prop("managedrepository.deleted",managedRepository.name())); + + }, + error: function(data) { + var res = $.parseJSON(data.responseText); + displayRestError(res); + }, + complete: function(){ + closeDialogConfirm(); + } + } + ); + + }, + $.i18n.prop("ok"), + $.i18n.prop("cancel"), + $.i18n.prop("managedrepository.delete.confirm",managedRepository.name()), + $("#managed-repository-delete-warning-tmpl").tmpl(managedRepository)); + } + + + } activateManagedRepositoriesGridTab=function(){ diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html index ebd9d1892..b74a9b85b 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html @@ -68,7 +68,7 @@ ${$.i18n.prop('release.included')} ${$.i18n.prop('snapshots.included')} ${$.i18n.prop('edit')} - + ${$.i18n.prop('delete')} @@ -92,7 +92,8 @@ {{/if}} - Edit + ${$.i18n.prop('edit')} + ${$.i18n.prop('delete')} {{/each}} @@ -190,4 +191,20 @@ + + + \ No newline at end of file