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/02/06 10:14:10 UTC
svn commit: r1240941 - 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 Feb 6 09:14:10 2012
New Revision: 1240941
URL: http://svn.apache.org/viewvc?rev=1240941&view=rev
Log:
cleanup name and open a dialog confirm for managed repositories bulk save
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/network-proxies.js
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/network-proxies.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=1240941&r1=1240940&r2=1240941&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 Feb 6 09:14:10 2012
@@ -77,6 +77,7 @@ releases=Releases
stageRepoNeeded=Staging Repository
cronExpression.notvalid=Cron Expression not valid
managedrepository.updated=Managed Repository {0} updated.
+managed.repository.bulk.save.confirm=Are you sure to update {0} Managed Repository(ies)
# remote repositories screen
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js?rev=1240941&r1=1240940&r2=1240941&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js Mon Feb 6 09:14:10 2012
@@ -145,11 +145,9 @@ $(function() {
});
return prx;
}
- updateModifiedManagedRepositories=function(){
- }
- updateModifiedNetworkProxy=function(){
+ updateModifiedNetworkProxies=function(){
var modifiedNetworkProxies = getModifiedNetworkProxies();
openDialogConfirm(function(){
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=1240941&r1=1240940&r2=1240941&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 Feb 6 09:14:10 2012
@@ -396,9 +396,17 @@ $(function() {
}
updateModifiedManagedRepositories=function(){
var repos = getModifiedManagedRepositories();
- for (i=0;i<repos.length;i++){
- updateManagedRepository(repos[i]);
- }
+
+ openDialogConfirm(function(){
+ for (i=0;i<repos.length;i++){
+ updateManagedRepository(repos[i]);
+ }
+ closeDialogConfirm();
+ },
+ $.i18n.prop('ok'),
+ $.i18n.prop('cancel'),
+ $.i18n.prop('bulk.save.confirm.title'),
+ $.i18n.prop('managed.repository.bulk.save.confirm',repos.length));
}
showStats=function(managedRepository){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html?rev=1240941&r1=1240940&r2=1240941&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html Mon Feb 6 09:14:10 2012
@@ -156,6 +156,6 @@
<script id="network-proxies-bulk-save-tmpl" type='text/x-jquery-tmpl'>
{{if bulkSave()}}
- <button data-bind="click: updateModifiedNetworkProxy" class="btn">${$.i18n.prop('save.all')}</button>
+ <button data-bind="click: updateModifiedNetworkProxies" class="btn">${$.i18n.prop('save.all')}</button>
{{/if}}
</script>
\ No newline at end of file