From e166ebdd2c33110a5eb236905ead9b8c1558c381 Mon Sep 17 00:00:00 2001 From: Stefan Matheis Date: Thu, 12 Apr 2012 07:41:36 +0000 Subject: [PATCH] SOLR-3339: Use solr_path instead of core_basepath for Cloud-View git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1325148 13f79535-47bb-0310-9956-ffa450edef68 --- solr/webapp/web/js/scripts/cloud.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/solr/webapp/web/js/scripts/cloud.js b/solr/webapp/web/js/scripts/cloud.js index d96818d4714..47721e40c3b 100644 --- a/solr/webapp/web/js/scripts/cloud.js +++ b/solr/webapp/web/js/scripts/cloud.js @@ -15,8 +15,6 @@ limitations under the License. */ -var core_basepath = null; - var init_debug = function( cloud_element ) { var debug_element = $( '#debug', cloud_element ); @@ -73,7 +71,7 @@ var init_debug = function( cloud_element ) $.ajax ( { - url : core_basepath + '/zookeeper?wt=json&dump=true', + url : app.config.solr_path + '/zookeeper?wt=json&dump=true', dataType : 'text', context : debug_element, beforeSend : function( xhr, settings ) @@ -243,7 +241,7 @@ var init_graph = function( graph_element ) $.ajax ( { - url : core_basepath + '/zookeeper?wt=json&detail=true&path=%2Fclusterstate.json', + url : app.config.solr_path + '/zookeeper?wt=json&detail=true&path=%2Fclusterstate.json', dataType : 'json', context : graph_element, beforeSend : function( xhr, settings ) @@ -318,7 +316,7 @@ var init_tree = function( tree_element ) $.ajax ( { - url : core_basepath + '/zookeeper?wt=json', + url : app.config.solr_path + '/zookeeper?wt=json', dataType : 'json', context : tree_element, beforeSend : function( xhr, settings ) @@ -494,7 +492,6 @@ sammy.get /^#\/~(cloud)$/, function( context ) { - core_basepath = $( 'li[data-basepath]', app.menu_element ).attr( 'data-basepath' ); var content_element = $( '#content' ); $.get