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/19 01:01:19 UTC
svn commit: r1233134 - 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: Thu Jan 19 00:01:18 2012
New Revision: 1233134
URL: http://svn.apache.org/viewvc?rev=1233134&view=rev
Log:
[MRM-1574] action to scan repository
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=1233134&r1=1233133&r2=1233134&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 Thu Jan 19 00:01:18 2012
@@ -32,4 +32,7 @@ managedrepository.delete.warning.message
managedrepository.deleted=Managed Repository " {0} " deleted.
managedrepository.location.already.exists=WARNING: Repository location already exists.
managedrepository.location.already.exists.warning.message=Are you sure you want to use this directory
-managedrepository.add.title=Add Managed Repository
\ No newline at end of file
+managedrepository.add.title=Add Managed Repository
+managedrepository.scan.now=Scan Repository Now
+managedrepository.scan.all=Process All Artifacts
+managedrepository.scanned=Managed Repository " {0} " scanned.
\ 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=1233134&r1=1233133&r2=1233134&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 Thu Jan 19 00:01:18 2012
@@ -224,6 +224,41 @@ $(function() {
activateManagedRepositoryFormValidation();
}
+ scanNow=function(managedRepository){
+ clearUserMessages();
+ openDialogConfirm(
+ function(){
+ $("#dialog-confirm-modal #modal-login-footer").append(smallSpinnerImg());
+ var checked = $("#managed-repository-scan-now-all").get(0).checked;
+ var url = "restServices/archivaServices/repositoriesService/scanRepositoryNow?";
+ url += "repositoryId="+encodeURIComponent(managedRepository.id());
+ url += "&fullScan="+(checked==true?"true":"false");
+ $.ajax(url,
+ {
+ type: "GET",
+ success: function(data) {
+ self.managedRepositories.remove(managedRepository);
+ displaySuccessMessage($.i18n.prop("managedrepository.scanned",managedRepository.name()));
+
+ },
+ error: function(data) {
+ var res = $.parseJSON(data.responseText);
+ displayRestError(res);
+ },
+ complete: function(){
+ removeSmallSpinnerImg();
+ closeDialogConfirm();
+ }
+ }
+ );
+ },
+ $.i18n.prop("ok"),
+ $.i18n.prop("cancel"),
+ $.i18n.prop("managedrepository.scan.now"),
+ $("#managed-repository-scan-now-modal-tmpl").tmpl(managedRepository));
+
+ }
+
removeManagedRepository=function(managedRepository){
clearUserMessages();
openDialogConfirm(
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=1233134&r1=1233133&r2=1233134&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 Thu Jan 19 00:01:18 2012
@@ -66,6 +66,7 @@
{{/each}}
<th>${$.i18n.prop('release.included')}</th>
<th>${$.i18n.prop('snapshots.included')}</th>
+ <th>${$.i18n.prop('managedrepository.scan.now')}</th>
<th>${$.i18n.prop('edit')}</th>
<th>${$.i18n.prop('delete')}</th>
</tr>
@@ -91,6 +92,7 @@
<img src="images/dialog-error.png"/>
{{/if}}
</td>
+ <td><a href="#" data-bind="click: function(){ scanNow(row) }">${$.i18n.prop('managedrepository.scan.now')}</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) }">
@@ -236,4 +238,10 @@
<div>${$.i18n.prop('name')}: ${name()}</div>
</div>
</div>
+</script>
+<script id="managed-repository-scan-now-modal-tmpl" type='text/x-jquery-tmpl'>
+ <div>
+ ${$.i18n.prop('managedrepository.scan.all')}: <input type="checkbox" id="managed-repository-scan-now-all">
+ </div>
+
</script>
\ No newline at end of file