Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 975BADC7D for ; Thu, 14 Mar 2013 16:42:46 +0000 (UTC) Received: (qmail 27551 invoked by uid 500); 14 Mar 2013 16:42:46 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 27542 invoked by uid 99); 14 Mar 2013 16:42:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Mar 2013 16:42:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Mar 2013 16:42:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2C3052388A33; Thu, 14 Mar 2013 16:40:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1456521 - in /lucene/dev/trunk/solr: CHANGES.txt webapp/web/js/scripts/analysis.js Date: Thu, 14 Mar 2013 16:40:38 -0000 To: commits@lucene.apache.org From: steffkes@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130314164038.2C3052388A33@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: steffkes Date: Thu Mar 14 16:40:37 2013 New Revision: 1456521 URL: http://svn.apache.org/r1456521 Log: SOLR-4371: Admin UI - Analysis Screen shows empty result Modified: lucene/dev/trunk/solr/CHANGES.txt lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js Modified: lucene/dev/trunk/solr/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1456521&r1=1456520&r2=1456521&view=diff ============================================================================== --- lucene/dev/trunk/solr/CHANGES.txt (original) +++ lucene/dev/trunk/solr/CHANGES.txt Thu Mar 14 16:40:37 2013 @@ -87,6 +87,8 @@ Bug Fixes * SOLR-4543: setting shardHandlerFactory in solr.xml/solr.properties does not work. (Ryan Ernst, Robert Muir via Erick Ericson) +* SOLR-4371: Admin UI - Analysis Screen shows empty result (steffkes) + Other Changes ---------------------- Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js?rev=1456521&r1=1456520&r2=1456521&view=diff ============================================================================== --- lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js (original) +++ lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js Thu Mar 14 16:40:37 2013 @@ -247,9 +247,12 @@ sammy.get 'submit', function( event ) { - var params = compute_analysis_params(); + var params = $.param( compute_analysis_params() ) + .replace( /[\w\.]+=\+*(&)/g, '$1' ) // remove empty parameters + .replace( /(&)+/, '$1' ) // reduce multiple ampersands + .replace( /^&/, '' ); // remove leading ampersand - context.redirect( context.path.split( '?' ).shift() + '?' + $.param( params ) ); + context.redirect( context.path.split( '?' ).shift() + '?' + params ); return false; } )