lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steff...@apache.org
Subject svn commit: r1517770 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/webapp/ solr/webapp/web/js/scripts/logging.js
Date Tue, 27 Aug 2013 09:50:43 GMT
Author: steffkes
Date: Tue Aug 27 09:50:42 2013
New Revision: 1517770

URL: http://svn.apache.org/r1517770
Log:
SOLR-5112: Show full message in Admin UI Logging View (merge r1517769)

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/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=1517770&r1=1517769&r2=1517770&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue Aug 27 09:50:42 2013
@@ -128,6 +128,9 @@ Bug Fixes
 * SOLR-4817 Solr should not fall back to the back compat built in solr.xml in SolrCloud 
   mode (Erick Erickson)
 
+* SOLR-5112: Show full message in Admin UI Logging View (Matthew Keeney via
+  steffkes)
+
 Optimizations
 ----------------------
 

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=1517770&r1=1517769&r2=1517770&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 Aug 27 09:50:42
2013
@@ -334,8 +334,8 @@ var load_logging_viewer = function()
             var lines = doc.message.split( "\n" );
             if( 1 < lines.length )
             {
-              doc.message = lines[0];
               doc.trace = doc.message;
+              doc.message = lines[0];
               delete lines;
             }
           }
@@ -360,14 +360,7 @@ var load_logging_viewer = function()
           if( has_trace )
           {
             content += '<tr class="trace">' + "\n";
-              
-              // (1) with colspan
               content += '<td colspan="4"><pre>' + doc.trace.esc() + '</pre></td>'
+ "\n";
-              
-              // (2) without colspan
-              //content += '<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>';
-              //content += '<td>' + doc.trace.esc().replace( /\n/g, '<br>' )
+ '</td>' + "\n";
-
             content += '</tr>' + "\n";
           }
 



Mime
View raw message