You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2012/04/04 18:35:52 UTC
svn commit: r1309485 - /lucene/dev/trunk/solr/webapp/web/js/scripts/index.js
Author: ryan
Date: Wed Apr 4 16:35:52 2012
New Revision: 1309485
URL: http://svn.apache.org/viewvc?rev=1309485&view=rev
Log:
SOLR-3311: fix dashboard view on windows
Modified:
lucene/dev/trunk/solr/webapp/web/js/scripts/index.js
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/index.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/index.js?rev=1309485&r1=1309484&r2=1309485&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/index.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/index.js Wed Apr 4 16:35:52 2012
@@ -99,7 +99,7 @@ var system_info = function( element, sys
{
// -- usage
- var load_average = system_data['system']['uptime'].match( /load average: (.+)/ );
+ var load_average = ( system_data['system']['uptime'] || '' ).match( /load average: (.+)/ );
if( load_average && load_average[1] )
{
var hl = $( '#system h2', element );
@@ -239,10 +239,10 @@ sammy.get
'dir_index' : app.dashboard_values['core']['directory']['index'],
'jvm_version' : app.dashboard_values['jvm']['name'] + ' (' + app.dashboard_values['jvm']['version'] + ')',
'processors' : app.dashboard_values['jvm']['processors'],
- 'solr_spec_version' : app.dashboard_values['lucene']['solr-spec-version'],
- 'solr_impl_version' : app.dashboard_values['lucene']['solr-impl-version'],
- 'lucene_spec_version' : app.dashboard_values['lucene']['lucene-spec-version'],
- 'lucene_impl_version' : app.dashboard_values['lucene']['lucene-impl-version']
+ 'solr_spec_version' : app.dashboard_values['lucene']['solr-spec-version'] || '-',
+ 'solr_impl_version' : app.dashboard_values['lucene']['solr-impl-version'] || '-',
+ 'lucene_spec_version' : app.dashboard_values['lucene']['lucene-spec-version'] || '-',
+ 'lucene_impl_version' : app.dashboard_values['lucene']['lucene-impl-version'] || '-'
};
if( app.dashboard_values['core']['directory']['cwd'] )