lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steff...@apache.org
Subject svn commit: r1487590 - in /lucene/dev/branches/lucene_solr_4_3: ./ solr/ solr/CHANGES.txt solr/webapp/ solr/webapp/web/css/styles/logging.css solr/webapp/web/js/scripts/logging.js
Date Wed, 29 May 2013 18:53:54 GMT
Author: steffkes
Date: Wed May 29 18:53:53 2013
New Revision: 1487590

URL: http://svn.apache.org/r1487590
Log:
SOLR-4867: Admin UI - setting loglevel on root throws RangeError (merge r1487096)

Modified:
    lucene/dev/branches/lucene_solr_4_3/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt
    lucene/dev/branches/lucene_solr_4_3/solr/webapp/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/webapp/web/css/styles/logging.css
    lucene/dev/branches/lucene_solr_4_3/solr/webapp/web/js/scripts/logging.js

Modified: lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt?rev=1487590&r1=1487589&r2=1487590&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt Wed May 29 18:53:53 2013
@@ -88,6 +88,8 @@ Bug Fixes
 
 * SOLR-4855: DistributedUpdateProcessor doesn't check for peer sync requests (shalin)
 
+* SOLR-4867: Admin UI - setting loglevel on root throws RangeError (steffkes)
+
 Other Changes
 ----------------------
 

Modified: lucene/dev/branches/lucene_solr_4_3/solr/webapp/web/css/styles/logging.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_3/solr/webapp/web/css/styles/logging.css?rev=1487590&r1=1487589&r2=1487590&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_3/solr/webapp/web/css/styles/logging.css (original)
+++ lucene/dev/branches/lucene_solr_4_3/solr/webapp/web/css/styles/logging.css Wed May 29
18:53:53 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/lucene_solr_4_3/solr/webapp/web/js/scripts/logging.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_3/solr/webapp/web/js/scripts/logging.js?rev=1487590&r1=1487589&r2=1487590&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_3/solr/webapp/web/js/scripts/logging.js (original)
+++ lucene/dev/branches/lucene_solr_4_3/solr/webapp/web/js/scripts/logging.js Wed May 29 18:53:53
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>';



Mime
View raw message