Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

start work on proxy connector screen 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1237693 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-01-30 14:57:11 +00:00
parent 9a00a3a355
commit 710d7058c3
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
View File

@ -64,34 +64,30 @@ $(function() {
//sourceRepoId //sourceRepoId
for(i=0;i<self.proxyConnectors().length;i++){ for(i=0;i<self.proxyConnectors().length;i++){
var curSrcRepo=self.proxyConnectors()[i].sourceRepoId(); var curSrcRepo=self.proxyConnectors()[i].sourceRepoId();
var curTarget=self.proxyConnectors()[i].targetRepoId(); var curTarget=self.proxyConnectors()[i].targetRepoId();
$.log("curSrcRepo:"+curSrcRepo+",curTarget:"+curTarget);
var sourceRepo = $.grep(sourcesRepos, var sourceRepo = $.grep(sourcesRepos,
function(srcRepo,idx){ function(srcRepo,idx){
$.log("grep:"+srcRepo.source);
$.log("sourcesRepos.length:"+sourcesRepos.length);
for (j=0;j<sourcesRepos.length;j++){ for (j=0;j<sourcesRepos.length;j++){
if (srcRepo.source==curSrcRepo){ if (srcRepo.source==sourcesRepos[j].source){
return true; return true;
} }
} }
return false; return false;
} }
); );
$.log("isArray:"+$.isArray(sourceRepo)+",length:"+sourceRepo.length);
if (sourceRepo.length>0){ if (sourceRepo.length>0){
$.log("sourceRepo!=null:"+sourceRepo[0]);
sourceRepo[0].targetRepos.push(curTarget); sourceRepo[0].targetRepos.push(curTarget);
} else { } else {
$.log("sourceRepo==null:"+curSrcRepo); $.log("sourceRepo==null:"+curSrcRepo);
sourcesRepos.push({source:curSrcRepo,targetRepos:[curTarget]}); sourcesRepos.push({source:curSrcRepo,targetRepos:[curTarget]});
if (sourceRepo!=null){
$.log("sourceRepoId:"+curSrcRepo);
sourcesRepos.push({source:curSrcRepo,targetRepos:[curTarget]});
} else {
sourceRepo.targetRepos.push(curTarget);
} }
} }
$.log("sourcesRepo.length:"+sourcesRepos.length);
for(i=0;i<sourcesRepos.length;i++){
$.log("sourcesRepos[i]:"+sourcesRepos[i].source+"="+sourcesRepos[i].targetRepos.join(":"));
}
} }
} }

4
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
View File

@ -20,7 +20,6 @@
<div class="page-header"> <div class="page-header">
<h2>${$.i18n.prop('proxy-connectors.list')}</h2> <h2>${$.i18n.prop('proxy-connectors.list')}</h2>
</div> </div>
<ul id="proxy-connector-view-tabs" class="tabs"> <ul id="proxy-connector-view-tabs" class="tabs">
<li id="network-proxies-view-tabs-li-grid" class="active"> <li id="network-proxies-view-tabs-li-grid" class="active">
<a href="#network-proxies-view" id="network-proxies-view-tabs-a-network-proxies-grid">${$.i18n.prop('network-proxies.grid.tab.title')}</a> <a href="#network-proxies-view" id="network-proxies-view-tabs-a-network-proxies-grid">${$.i18n.prop('network-proxies.grid.tab.title')}</a>
@ -31,12 +30,11 @@
</ul> </ul>
<div id="network-proxies-view-tabs-content" class="tab-content"> <div id="network-proxies-view-tabs-content" class="tab-content">
<div id="network-proxies-view" class="active"> <div id="network-proxies-view" class="active">
<table class="bordered-table zebra-striped" id="networkProxiesTable> <table class="bordered-table zebra-striped" id="networkProxiesTable"
data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko-network-proxies-grid',pageLinksId:'network-proxiesPagination'"> data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko-network-proxies-grid',pageLinksId:'network-proxiesPagination'">
</table> </table>
<div id="network-proxiesPagination"></div> <div id="network-proxiesPagination"></div>
</div> </div>
<div id="network-proxies-edit" data-bind='template: {name:"network-proxy-edit-tmpl"}'></div> <div id="network-proxies-edit" data-bind='template: {name:"network-proxy-edit-tmpl"}'></div>
</div> </div>
</script> </script>