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 17:54:20 UTC
svn commit: r1232063 - 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 16:54:20 2012
New Revision: 1232063
URL: http://svn.apache.org/viewvc?rev=1232063&view=rev
Log:
[MRM-1574] delete managed repository
TODO ask for delete content !
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=1232063&r1=1232062&r2=1232063&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 16:54:20 2012
@@ -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
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=1232063&r1=1232062&r2=1232063&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 16:54:20 2012
@@ -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(){
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=1232063&r1=1232062&r2=1232063&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 16:54:20 2012
@@ -68,7 +68,7 @@
<th>${$.i18n.prop('release.included')}</th>
<th>${$.i18n.prop('snapshots.included')}</th>
<th>${$.i18n.prop('edit')}</th>
-
+ <th>${$.i18n.prop('delete')}</th>
</tr>
</thead>
<tbody>
@@ -92,7 +92,8 @@
<img src="images/dialog-error.png"/>
{{/if}}
</td>
- <td><a href="#" data-bind="click: function(){ editManagedRepository(row) }">Edit</a></td>
+ <td><a href="#" data-bind="click: function(){ editManagedRepository(row) }">${$.i18n.prop('edit')}</a></td>
+ <td><a href="#" data-bind="click: function(){ removeManagedRepository(row) }">${$.i18n.prop('delete')}</a></td>
</tr>
{{/each}}
</tbody>
@@ -190,4 +191,20 @@
<button data-bind="click: save" class="btn">${$.i18n.prop('save')}</button>
<button data-bind="click: displayGrid" class="btn">${$.i18n.prop('cancel')}</button>
</form>
+</script>
+
+<script id="managed-repository-delete-warning-tmpl" type='text/x-jquery-tmpl'>
+ <div>
+ <a class="close" href="#">Ã</a>
+ <div class="alert-message warning">
+ <p>
+ <strong>${$.i18n.prop('warning.not.undone.operation')}</strong>
+ </p>
+ </div>
+ <div>
+ <span><strong>${$.i18n.prop('managedrepository.delete.warning.message')}</strong>.</span>
+ <div>${$.i18n.prop('id')}: ${id()}</div>
+ <div>${$.i18n.prop('name')}: ${name()}</div>
+ </div>
+ </div>
</script>
\ No newline at end of file