You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by st...@apache.org on 2013/05/28 22:22:55 UTC
svn commit: r1487097 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/webapp/ solr/webapp/web/css/styles/logging.css
solr/webapp/web/js/scripts/logging.js
Author: steffkes
Date: Tue May 28 20:22:54 2013
New Revision: 1487097
URL: http://svn.apache.org/r1487097
Log:
SOLR-4867: Admin UI - setting loglevel on root throws RangeError (merge r1487096)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/logging.css
lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/logging.js
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1487097&r1=1487096&r2=1487097&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue May 28 20:22:54 2013
@@ -84,6 +84,8 @@ Bug Fixes
* SOLR-4814: If a SolrCore cannot be created it should remove any information it
published about itself from ZooKeeper. (Mark Miller)
+* SOLR-4867: Admin UI - setting loglevel on root throws RangeError (steffkes)
+
Other Changes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/logging.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/logging.css?rev=1487097&r1=1487096&r2=1487097&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/logging.css (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/logging.css Tue May 28 20:22:54 2013
@@ -193,6 +193,13 @@
padding-right: 21px;
}
+#content #logging .jstree a span.name em
+{
+ color: #f00;
+ font-style: normal;
+ text-transform: uppercase;
+}
+
#content #logging .jstree a.trigger.set
{
font-weight: bold;
@@ -224,6 +231,7 @@
#content #logging .jstree li li li li li .selector-holder { left: 368px; }
#content #logging .jstree li li li li li li .selector-holder { left: 350px; }
#content #logging .jstree li li li li li li li .selector-holder { left: 332px; }
+#content #logging .jstree li li li li li li li li .selector-holder { left: 314px; }
#content #logging .jstree .selector
{
Modified: lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/logging.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/logging.js?rev=1487097&r1=1487096&r2=1487097&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/logging.js (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/logging.js Tue May 28 20:22:54 2013
@@ -99,17 +99,20 @@ var logging_handler = function( response
logger_content += '<span class="ns">' + logger_name.join( '.' ).esc() + '.</span>';
}
- logger_content += '<span class="name">' + display_name.esc() + '</span>' + "\n";
+ logger_content += '<span class="name">' + ( display_name ? display_name.esc() : '<em>empty</em>' ) + '</span>' + "\n";
logger_content += '</a>';
logger_content += levels;
- var child_logger_content = logger_tree( logger.name );
- if( child_logger_content )
+ if( !!logger.name )
{
- logger_content += '<ul>';
- logger_content += child_logger_content;
- logger_content += '</ul>';
+ var child_logger_content = logger_tree( logger.name );
+ if( child_logger_content )
+ {
+ logger_content += '<ul>';
+ logger_content += child_logger_content;
+ logger_content += '</ul>';
+ }
}
logger_content += '</li>';