Author: olamy
Date: Sun Feb 26 23:06:30 2012
New Revision: 1293954
URL: http://svn.apache.org/viewvc?rev=1293954&view=rev
Log:
confirm modal on repository group delete
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/repository-groups.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.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=1293954&r1=1293953&r2=1293954&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
Sun Feb 26 23:06:30 2012
@@ -177,6 +177,7 @@ repository.group.added=Repository Group
repository.groups.available.repositories=Available Repositories
repository.groups.list=Repository Groups
repository-groups.grid.tab.title=Repository Groups
+repository.group.delete.confirm=Are you sure to delete Repository Group {0} ?
#roles
roles.bulk.save.confirm=Are you sure to update {0} Role(s)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js?rev=1293954&r1=1293953&r2=1293954&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
Sun Feb 26 23:06:30 2012
@@ -80,8 +80,14 @@ $(function() {
this.findManagedRepository=function(id){
return findManagedRepository(id,self.managedRepositories());
}
-
this.deleteRepositoryGroup=function(repositoryGroup){
+ openDialogConfirm(
+
function(){self.removeRepositoryGroup(repositoryGroup);window.modalConfirmDialog.modal('hide')},
+ $.i18n.prop('ok'), $.i18n.prop('cancel'),
+ $.i18n.prop('repository.group.delete.confirm',repositoryGroup.id()),
+
$("#repository-group-location-warning-tmpl").tmpl(self.repositoryGroup));
+ }
+ this.removeRepositoryGroup=function(repositoryGroup){
clearUserMessages();
$.ajax("restServices/archivaServices/repositoryGroupService/deleteRepositoryGroup/"+encodeURIComponent(repositoryGroup.id()),
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html?rev=1293954&r1=1293953&r2=1293954&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html
Sun Feb 26 23:06:30 2012
@@ -154,4 +154,10 @@
</blockquote>
</div>
+</script>
+
+<script id="repository-group-location-warning-tmpl" type='text/x-jquery-tmpl'>
+ <div>
+ <span class="label
label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
+ </div>
</script>
\ No newline at end of file
