Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-4612: Admin UI - Analysis Screen contains empty table-columns 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1542547 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Matheis 2013-11-16 18:54:15 +00:00
parent a30b4ef94d
commit dc651394b1
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -99,6 +99,8 @@ Bug Fixes
* SOLR-5445: Proxied responses should propagate all headers rather than the * SOLR-5445: Proxied responses should propagate all headers rather than the
first one for each key. (Patrick Hunt, Mark Miller) first one for each key. (Patrick Hunt, Mark Miller)
* SOLR-4612: Admin UI - Analysis Screen contains empty table-columns (steffkes)
Other Changes Other Changes
--------------------- ---------------------

24
solr/webapp/web/js/scripts/analysis.js
View File

@ -355,31 +355,17 @@ sammy.get
if( 0 !== type_length ) if( 0 !== type_length )
{ {
var global_elements_count = 0; var global_elements_count = 0;
for( var i = 0; i < analysis_data[type].length; i += 2 ) if( 'string' === typeof analysis_data[type][1] )
{ {
if( 'string' === typeof analysis_data[type][i+1] ) analysis_data[type][1] = [{ 'text': analysis_data[type][1] }]
{
analysis_data[type][i+1] = [{ 'text': analysis_data[type][i+1] }]
} }
var tmp = {}; var c = analysis_data[type][1].length;
var cols = analysis_data[type][i+1].filter for( var i = 0; i < c; i++ )
(
function( obj )
{ {
var obj_position = obj.position || 0; global_elements_count = Math.max( analysis_data[type][1][i].position || 0, global_elements_count );
if( !tmp[obj_position] )
{
tmp[obj_position] = true;
return true;
} }
return false;
}
);
global_elements_count = Math.max( global_elements_count, cols.length );
}
var content = '<div class="' + type + '">' + "\n"; var content = '<div class="' + type + '">' + "\n";
content += '<table border="0" cellspacing="0" cellpadding="0">' + "\n"; content += '<table border="0" cellspacing="0" cellpadding="0">' + "\n";