Author: olamy
Date: Mon Jan 30 16:31:39 2012
New Revision: 1237762
URL: http://svn.apache.org/viewvc?rev=1237762&view=rev
Log:
[MRM-1576] load informations and display repositories names.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.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/proxy-connectors.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js?rev=1237762&r1=1237761&r2=1237762&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
Mon Jan 30 16:31:39 2012
@@ -60,7 +60,9 @@ $(function() {
this.proxyConnectors=ko.observableArray([]);
var self=this;
this.managedRepositoryConnectorViews=ko.observableArray([]);
-
+ this.policyInformations=ko.observableArray([]);
+ this.managedRepositories=ko.observableArray([]);
+ this.remoteRepositories=ko.observableArray([]);
editProxyConnector=function(proxyConnector){
}
@@ -70,7 +72,7 @@ $(function() {
//sourceRepoId
for(i=0;i<self.proxyConnectors().length;i++){
var curSrcRepo=self.proxyConnectors()[i].sourceRepoId();
- var curTarget=self.proxyConnectors()[i].targetRepoId();
+ var curTarget=self.proxyConnectors()[i];
var sourceRepo = $.grep(sourcesRepos,
function(srcRepo,idx){
for (j=0;j<sourcesRepos.length;j++){
@@ -90,6 +92,24 @@ $(function() {
return sourcesRepos;
}
+ getManagedRepository=function(id){
+ var managedRepository=$.grep(self.managedRepositories(),
+ function(repo,idx){
+ return repo.id()==id;
+ }
+ );
+ return ($.isArray(managedRepository) && managedRepository.length>0)
?managedRepository[0]:new ManagedRepository();
+ }
+
+ getRemoteRepository=function(id){
+ var remoteRepository=$.grep(self.remoteRepositories(),
+ function(repo,idx){
+ return repo.id()==id;
+ }
+ );
+ return ($.isArray(remoteRepository) && remoteRepository.length>0)
?remoteRepository[0]:new RemoteRepository();
+ }
+
this.displayGrid=function(){
self.managedRepositoryConnectorViews(this.findUniqueManagedRepos());
$.log("uniqueManagedRepos:"+self.managedRepositoryConnectorViews().length);
@@ -100,37 +120,60 @@ $(function() {
$("#main-content #proxyConnectorsTable [title]").twipsy();
}
});
+ this.gridViewModel.getManagedRepository=getManagedRepository;
ko.applyBindings(this,$("#main-content #proxyConnectorsTable").get(0));
removeSmallSpinnerImg("#main-content");
$("#main-content #proxy-connectors-view-tabs").tabs();
}
+
}
+ // FIXME use various callback to prevent async false !!
+
displayProxyConnectors=function(){
$("#main-content").html($("#proxyConnectorsMain").tmpl());
$("#main-content").append(smallSpinnerImg());
- var proxyConnectorsViewModel = new ProxyConnectorsViewModel();
+ this.proxyConnectorsViewModel = new ProxyConnectorsViewModel();
+ var self=this;
-
$.ajax("restServices/archivaServices/proxyConnectorService/getProxyConnectors",
{
+
$.ajax("restServices/archivaServices/managedRepositoriesService/getManagedRepositories",
{
type: "GET",
dataType: 'json',
+ async: false,
success: function(data) {
- proxyConnectorsViewModel.proxyConnectors(mapProxyConnectors(data));
- proxyConnectorsViewModel.displayGrid();
+
self.proxyConnectorsViewModel.managedRepositories(mapManagedRepositories(data));
}
- }
- );
+ });
+
+
$.ajax("restServices/archivaServices/remoteRepositoriesService/getRemoteRepositories",
{
+ type: "GET",
+ dataType: 'json',
+ async: false,
+ success: function(data) {
+
self.proxyConnectorsViewModel.remoteRepositories(mapRemoteRepositories(data));
+ }
+ });
$.ajax("restServices/archivaServices/proxyConnectorService/allPolicies", {
type: "GET",
dataType: 'json',
+ async: false,
success: function(data) {
- mapPolicyInformations(data);
+
self.proxyConnectorsViewModel.policyInformations(mapPolicyInformations(data));
}
}
);
+
$.ajax("restServices/archivaServices/proxyConnectorService/getProxyConnectors",
{
+ type: "GET",
+ dataType: 'json',
+ success: function(data) {
+
self.proxyConnectorsViewModel.proxyConnectors(mapProxyConnectors(data));
+ self.proxyConnectorsViewModel.displayGrid();
+ }
+ }
+ );
}
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=1237762&r1=1237761&r2=1237762&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 30 16:31:39 2012
@@ -414,7 +414,7 @@ $(function() {
$("#managed-repositories-pom-snippet").html(mediumSpinnerImg());
$('#managed-repositories-pom-snippet').show();
- var url =
"restServices/archivaServices/managedRepositoriesService/getPomSnippet/"+managedRepository.id();
+ var url =
"restServices/archivaServices/managedRepositoriesService/getPomSnippet/"+encodeURIComponent(managedRepository.id());
$.ajax(url,
{
type: "GET",
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html?rev=1237762&r1=1237761&r2=1237762&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
Mon Jan 30 16:31:39 2012
@@ -51,10 +51,12 @@
{{each(i, row) itemsOnCurrentPage()}}
<tr>
- <td>${row.source()}</td>
+ {{var val = row.source()}}
+ <td>${val}-${getManagedRepository(val).name()}</td>
<td>
{{each(j, targetRepo) row.targetRepos()}}
- <div>${targetRepo}</div>
+ {{var targetRepoId = targetRepo.targetRepoId()}}
+
<div>${targetRepoId}-${getRemoteRepository(targetRepoId).name()}</div>
{{/each}}
</td>
</tr>
