You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/09/04 17:40:02 UTC
svn commit: r1380684 - in /lucene/dev/trunk/solr: CHANGES.txt
webapp/web/js/scripts/cloud.js
Author: markrmiller
Date: Tue Sep 4 15:40:02 2012
New Revision: 1380684
URL: http://svn.apache.org/viewvc?rev=1380684&view=rev
Log:
SOLR-3611: We do not show ZooKeeper data in the UI for a node that has children.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1380684&r1=1380683&r2=1380684&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Sep 4 15:40:02 2012
@@ -110,6 +110,10 @@ Bug Fixes
* SOLR-3782: A leader going down while updates are coming in can cause shard
inconsistency. (Mark Miller)
+* SOLR-3611: We do not show ZooKeeper data in the UI for a node that has children.
+ (Mark Miller)
+
+
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js?rev=1380684&r1=1380683&r2=1380684&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js Tue Sep 4 15:40:02 2012
@@ -589,41 +589,35 @@ var init_tree = function( tree_element )
var data_element = $( '#data', this );
- if( 0 !== parseInt( response.znode.prop.children_count ) )
- {
- data_element.hide();
- }
- else
- {
- var highlight = false;
- var data = '<em>File "' + response.znode.path + '" has no Content</em>';
+ var highlight = false;
+ var data = '<em>File "' + response.znode.path + '" has no Content</em>';
- if( response.znode.data )
+ if( response.znode.data )
+ {
+ var classes = '';
+ var path = response.znode.path.split( '.' );
+
+ if( 1 < path.length )
{
- var classes = '';
- var path = response.znode.path.split( '.' );
-
- if( 1 < path.length )
- {
- highlight = true;
- classes = 'syntax language-' + path.pop().esc();
- }
-
- data = '<pre class="' + classes + '">'
- + response.znode.data.esc()
- + '</pre>';
+ highlight = true;
+ classes = 'syntax language-' + path.pop().esc();
}
+
+ data = '<pre class="' + classes + '">'
+ + response.znode.data.esc()
+ + '</pre>';
+ }
- data_element
- .show()
- .html( data );
+ data_element
+ .show()
+ .html( data );
- if( highlight )
- {
- hljs.highlightBlock( data_element.get(0) );
- }
+ if( highlight )
+ {
+ hljs.highlightBlock( data_element.get(0) );
}
+
},
error : function( xhr, text_status, error_thrown)
{