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/27 00:43:06 UTC
svn commit: r1236447 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva:
repositories.js templates/repositories.html
Author: olamy
Date: Thu Jan 26 23:43:06 2012
New Revision: 1236447
URL: http://svn.apache.org/viewvc?rev=1236447&view=rev
Log:
link remote repository id for remote index download
Modified:
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-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=1236447&r1=1236446&r2=1236447&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 26 23:43:06 2012
@@ -529,6 +529,7 @@ $(function() {
RemoteRepositoryViewModel=function(remoteRepository, update, remoteRepositoriesViewModel){
this.remoteRepository=remoteRepository;
this.remoteRepositoriesViewModel = remoteRepositoriesViewModel;
+ this.networkProxies=ko.observableArray([]);
this.update = update;
var self = this;
@@ -586,17 +587,24 @@ $(function() {
RemoteRepositoriesViewModel=function(){
this.remoteRepositories=ko.observableArray([]);
-
this.gridViewModel = null;
var self = this;
editRemoteRepository=function(remoteRepository){
$.log("editRemoteRepository");
- var viewModel = new RemoteRepositoryViewModel(remoteRepository,true,self);
- ko.applyBindings(viewModel,$("#main-content #remote-repository-edit").get(0));
- activateRemoteRepositoryEditTab();
- $("#remote-repository-edit-li a").html($.i18n.prop('edit'));
- activateRemoteRepositoryFormValidation();
+ $.ajax("restServices/archivaServices/networkProxyService/getNetworkProxies", {
+ type: "GET",
+ dataType: 'json',
+ success: function(data) {
+ var viewModel = new RemoteRepositoryViewModel(remoteRepository,true,self);
+ viewModel.networkProxies(mapNetworkProxies(data));
+ ko.applyBindings(viewModel,$("#main-content #remote-repository-edit").get(0));
+ activateRemoteRepositoryEditTab();
+ $("#remote-repository-edit-li a").html($.i18n.prop('edit'));
+ activateRemoteRepositoryFormValidation();
+ }
+ })
+
}
removeRemoteRepository=function(remoteRepository){
@@ -784,6 +792,7 @@ $(function() {
);
+
$("#main-content #managed-repositories-pills").bind('change', function (e) {
if ($(e.target).attr("href")=="#managed-repository-edit") {
var viewModel = new ManagedRepositoryViewModel(new ManagedRepository(),false,managedRepositoriesViewModel);
@@ -798,9 +807,16 @@ $(function() {
$("#main-content #remote-repositories-pills").bind('change', function (e) {
if ($(e.target).attr("href")=="#remote-repository-edit") {
- var viewModel = new RemoteRepositoryViewModel(new RemoteRepository(),false,remoteRepositoriesViewModel);
- ko.applyBindings(viewModel,$("#main-content #remote-repository-edit").get(0));
- activateRemoteRepositoryFormValidation();
+ $.ajax("restServices/archivaServices/networkProxyService/getNetworkProxies", {
+ type: "GET",
+ dataType: 'json',
+ success: function(data) {
+ var viewModel = new RemoteRepositoryViewModel(new RemoteRepository(),false,remoteRepositoriesViewModel);
+ viewModel.networkProxies(mapNetworkProxies(data));
+ ko.applyBindings(viewModel,$("#main-content #remote-repository-edit").get(0));
+ activateRemoteRepositoryFormValidation();
+ }
+ })
}
if ($(e.target).attr("href")=="#remote-repositories-view") {
$("#main-content #remote-repository-edit-li a").html($.i18n.prop("add"));
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=1236447&r1=1236446&r2=1236447&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 26 23:43:06 2012
@@ -415,7 +415,12 @@
</div>
</div>
- <!-- FIXME proxy id to use -->
+ <div class="clearfix">
+ <div class="input">
+ <select data-bind="options: networkProxies, optionsText: 'id',optionsValue:'id', value: remoteRepository.remoteDownloadNetworkProxyId, optionsCaption: 'Choose...'"></select>
+ </div>
+ </div>
+
<div class="clearfix">
<label for="downloadRemoteIndexOnStartup">${$.i18n.prop('downloadRemoteIndexOnStartup')}</label>