You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/01/16 23:56:42 UTC
svn commit: r1232211 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-web-common/src/main/resources/org/apache/archiva/i18n/
archiva-webapp-js/src/main/webapp/js/archiva/
archiva-webapp-js/src/main/webapp/js/archiva/templates/
Author: olamy
Date: Mon Jan 16 22:56:42 2012
New Revision: 1232211
URL: http://svn.apache.org/viewvc?rev=1232211&view=rev
Log:
[MRM-1574] delete managed repository
ask confirmation for deleting content or not.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1232211&r1=1232210&r2=1232211&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Mon Jan 16 22:56:42 2012
@@ -23,6 +23,7 @@
#default common
id=id
warning.not.undone.operation=WARNING: This operation can not be undone.
+managedrepository.delete.content=Delete Content too ?
# managed repositories screen
managedrepository.delete.confirm=Delete Managed Repository
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1232211&r1=1232210&r2=1232211&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js Mon Jan 16 22:56:42 2012
@@ -73,6 +73,7 @@ $(function() {
this.managedRepository=ko.observable(managedRepository);
this.managedRepositoriesViewModel = managedRepositoriesViewModel;
this.update = update;
+ var self = this;
save=function(){
var valid = $("#main-content #managed-repository-edit-form").valid();
if (valid==false) {
@@ -105,7 +106,7 @@ $(function() {
data: "{\"managedRepository\": " + ko.toJSON(this.managedRepository)+"}",
dataType: 'json',
success: function(data) {
- this.managedRepositoriesViewModel.managedRepositories.push(mapManagedRepository(data));
+ self.managedRepositoriesViewModel.managedRepositories.push(mapManagedRepository(data));
displaySuccessMessage($.i18n.prop('managedrepository.added'));
},
error: function(data) {
@@ -159,7 +160,10 @@ $(function() {
function(){
var url = "restServices/archivaServices/managedRepositoriesService/deleteManagedRepository?";
url += "repositoryId="+encodeURIComponent(managedRepository.id());
- url += "&deleteContent=false";
+
+ var checked = $("#managedrepository-deletecontent").get(0).checked;
+
+ url += "&deleteContent="+(checked==true?"true":"false");
$.ajax(url,
{
type: "GET",
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html?rev=1232211&r1=1232210&r2=1232211&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html Mon Jan 16 22:56:42 2012
@@ -206,5 +206,8 @@
<div>${$.i18n.prop('id')}: ${id()}</div>
<div>${$.i18n.prop('name')}: ${name()}</div>
</div>
+ <div>
+ ${$.i18n.prop('managedrepository.delete.content')}: <input type="checkbox" id="managedrepository-deletecontent">
+ </div>
</div>
</script>
\ No newline at end of file