From db79f00a15116bb64298ddfb255d0925641b3ba0 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 24 May 2012 16:22:29 +0000 Subject: [PATCH] fix copy/paste ids git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1342321 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/archiva/general-admin.js | 6 +++--- .../src/main/webapp/js/templates/archiva/general-admin.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js index 1513a7e44..877b447dd 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js @@ -521,7 +521,7 @@ define("archiva.general-admin",["jquery","i18n","order!utils","order!jquery.tmpl this.networkConfiguration=ko.observable(networkConfiguration); save=function(){ - if (!$("#main-content #network-proxy-edit-form").valid()){ + if (!$("#main-content #network-configuration-edit-form").valid()){ return; } clearUserMessages(); @@ -550,9 +550,9 @@ define("archiva.general-admin",["jquery","i18n","order!utils","order!jquery.tmpl var networkConfiguration=new NetworkConfiguration(data.maxTotal,data.maxTotalPerHost,data.usePooling); var networkConfigurationViewModel=new NetworkConfigurationViewModel(networkConfiguration); ko.applyBindings(networkConfigurationViewModel,mainContent.get(0)); - var validator = $("#main-content #network-proxy-edit-form").validate({ + var validator = mainContent.find("#network-configuration-edit-form").validate({ showErrors: function(validator, errorMap, errorList) { - customShowError(mainContent.find("#network-proxy-edit-form" ).get(0),validator,errorMap,errorMap); + customShowError(mainContent.find("#network-configuration-edit-form" ).get(0),validator,errorMap,errorMap); } }); } diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html index 3232a1176..f590ecca4 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html @@ -288,8 +288,8 @@