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

add proxy connector settings popover in order edit tab 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1243571 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-02-13 15:58:24 +00:00
parent dc5d74bd12
commit 18315817e6
2 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,27 +346,33 @@ $(function() {
} }
getProxyConnector=function(sourceRepoId,targetRepoId){ getProxyConnector=function(sourceRepoId,targetRepoId){
var proxyConnector=$.grep(self.proxyConnectors(), var proxyConnectors=$.grep(self.proxyConnectors(),
function(proxyConnector,idx){ function(proxyConnector,idx){
return proxyConnector.sourceRepoId()==sourceRepoId return proxyConnector.sourceRepoId()==sourceRepoId
&& proxyConnector.targetRepoId==targetRepoId; && proxyConnector.targetRepoId()==targetRepoId;
} }
); );
var res = ($.isArray(proxyConnector) && proxyConnector.length>0) ? proxyConnector[0]:new ProxyConnector(); var res = ($.isArray(proxyConnectors) && proxyConnectors.length>0) ? proxyConnectors[0]:new ProxyConnector();
return res; return res;
} }
showSettings=function(proxyConnector,targetContentStartId, targetImgStartId){ showSettings=function(proxyConnector,targetContentStartId, targetImgStartId,theProxyConnectorsViewModel){
//proxyConnector=getProxyConnector(proxyConnector.sourceRepoId(),proxyConnector.targetRepoId()); $.log("proxyConnector:"+proxyConnector.sourceRepoId()+":"+proxyConnector.targetRepoId());
var targetContent = $( (targetContentStartId?targetContentStartId:"#proxy-connectors-grid-remoterepo-settings-content-") var id = (targetContentStartId?targetContentStartId:"#proxy-connectors-grid-remoterepo-settings-content-")
+proxyConnector.sourceRepoId()+"-"+proxyConnector.targetRepoId()); +proxyConnector.sourceRepoId()+"-"+proxyConnector.targetRepoId();
var targetContent = $(id);
targetContent.html(""); targetContent.html("");
targetContent.append($("#proxy-connectors-remote-settings-popover-tmpl")
var tmplHtml = $("#proxy-connectors-remote-settings-popover-tmpl")
.tmpl({ .tmpl({
proxyConnectorsViewModel: self, proxyConnectorsViewModel: self,
proxyConnector:ko.toJS(proxyConnector) proxyConnector:ko.toJS(proxyConnector)
})); } ).html();
$.log("tmpl:"+tmplHtml);
targetContent.append(tmplHtml);
$.log("showSettings#targetContent:"+id+","+targetContent.length+","+targetContent.attr("id")+",html:"+targetContent.html());
var targetImg = $((targetImgStartId?targetImgStartId:"#proxy-connectors-grid-remoterepo-settings-edit-") var targetImg = $((targetImgStartId?targetImgStartId:"#proxy-connectors-grid-remoterepo-settings-edit-")
+proxyConnector.sourceRepoId()+"-"+proxyConnector.targetRepoId()); +proxyConnector.sourceRepoId()+"-"+proxyConnector.targetRepoId());
targetImg.attr("data-content",targetContent.html()); targetImg.attr("data-content",targetContent.html());
@ -381,6 +387,11 @@ $(function() {
} }
this.displaySettings=function(sourceRepoId,targetRepoId,targetContentStartId, targetImgStartId){
var proxyConnector=getProxyConnector(sourceRepoId,targetRepoId);
showSettings(proxyConnector,targetContentStartId,targetImgStartId);
}
this.findPolicyInformationName=function(id){ this.findPolicyInformationName=function(id){
for(i=0;i<self.policyInformations().length;i++){ for(i=0;i<self.policyInformations().length;i++){
if (id==self.policyInformations()[i].id()){ if (id==self.policyInformations()[i].id()){
@ -484,6 +495,13 @@ $(function() {
self.proxyConnectorsViewModel.updateModifiedProxyConnectors(); self.proxyConnectorsViewModel.updateModifiedProxyConnectors();
} }
displaySettings=function(sourceRepoId,targetRepoId){
$.log("ProxyConnectorEditOrderViewModel#showSettings:"+sourceRepoId+"-"+targetRepoId);
self.proxyConnectorsViewModel.displaySettings(sourceRepoId,targetRepoId,
"#proxy-connectors-order-remoterepo-settings-content-",
"#proxy-connectors-order-remoterepo-settings-edit-");
}
} }
displayProxyConnectors=function(){ displayProxyConnectors=function(){

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

@ -254,6 +254,13 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span1"> <div class="span1">
<img src="images/system-software-update-32-32.png"/> <img src="images/system-software-update-32-32.png"/>
<br/>
<img src="images/utilities-system-monitor-22-22.png"
id="proxy-connectors-order-remoterepo-settings-edit-${sourceRepoId()}-${targetRepoId()}"
data-original-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
data-bind="event: { mouseover: function(){ displaySettings(sourceRepoId(),targetRepoId())},}">
<div id="proxy-connectors-order-remoterepo-settings-content-${sourceRepoId()}-${targetRepoId()}"
style="display:none"></div>
</div> </div>
<div class="span6 pull-left"> <div class="span6 pull-left">
<blockquote> <blockquote>