svn commit: r1677366 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/licenses/ solr/webapp/ solr/webapp/web/js/ solr/webapp/web/js/lib/ solr/webapp/web/js/scripts/

[el...@apache.org]

Author: elyograg
Date: Sun May  3 05:04:58 2015
New Revision: 1677366

URL: http://svn.apache.org/r1677366
Log:
SOLR-7409: Sort datimport handlers in the admin UI (backport trunk r1677365)

Added:
    lucene/dev/branches/branch_5x/solr/licenses/javacscript-natural-sort-NOTICE.txt
      - copied unchanged from r1677365, lucene/dev/trunk/solr/licenses/javacscript-natural-sort-NOTICE.txt
    lucene/dev/branches/branch_5x/solr/licenses/javascript-natural-sort-LICENSE-MIT.txt
      - copied unchanged from r1677365, lucene/dev/trunk/solr/licenses/javascript-natural-sort-LICENSE-MIT.txt
    lucene/dev/branches/branch_5x/solr/webapp/web/js/lib/naturalSort.js
      - copied unchanged from r1677365, lucene/dev/trunk/solr/webapp/web/js/lib/naturalSort.js
Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/licenses/   (props changed)
    lucene/dev/branches/branch_5x/solr/webapp/   (props changed)
    lucene/dev/branches/branch_5x/solr/webapp/web/js/main.js
    lucene/dev/branches/branch_5x/solr/webapp/web/js/scripts/dataimport.js

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1677366&r1=1677365&r2=1677366&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Sun May  3 05:04:58 2015
@@ -251,6 +251,10 @@ Other Changes
   in solr/server/solr/configsets instead of example and harden error checking / validation
   logic. (hossman, Timothy Potter)
 
+* SOLR-7409: When there are multiple dataimport handlers defined, the admin UI
+  was listing them in a random order.  Now they are sorted in a natural order
+  that handles numbers properly. (Jellyfrog via Shawn Heisey)
+
 ==================  5.1.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

Modified: lucene/dev/branches/branch_5x/solr/webapp/web/js/main.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/js/main.js?rev=1677366&r1=1677365&r2=1677366&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/js/main.js (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/js/main.js Sun May  3 05:04:58 2015
@@ -32,6 +32,7 @@ require
     'lib/order!lib/ZeroClipboard',
     'lib/order!lib/d3',
     'lib/order!lib/chosen',
+    'lib/order!lib/naturalSort',
     'lib/order!scripts/app',
 
     'lib/order!scripts/analysis',

Modified: lucene/dev/branches/branch_5x/solr/webapp/web/js/scripts/dataimport.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/js/scripts/dataimport.js?rev=1677366&r1=1677365&r2=1677366&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/js/scripts/dataimport.js (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/js/scripts/dataimport.js Sun May  3 05:04:58 2015
@@ -45,7 +45,7 @@ sammy.bind
               dataimport_handlers.push( key );
             }
           }
-          params.callback( dataimport_handlers );
+          params.callback( dataimport_handlers.sort(naturalSort) );
         },
         error : function( xhr, text_status, error_thrown)
         {