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 88EAAEA91 for ; Sat, 5 Jan 2013 14:22:50 +0000 (UTC) Received: (qmail 23388 invoked by uid 500); 5 Jan 2013 14:22:50 -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 23381 invoked by uid 99); 5 Jan 2013 14:22:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Jan 2013 14:22:50 +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; Sat, 05 Jan 2013 14:22:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E07DF2388847; Sat, 5 Jan 2013 14:22:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1429287 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/webapp/ solr/webapp/web/js/scripts/app.js solr/webapp/web/js/scripts/cores.js Date: Sat, 05 Jan 2013 14:22:26 -0000 To: commits@lucene.apache.org From: steffkes@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130105142226.E07DF2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: steffkes Date: Sat Jan 5 14:22:26 2013 New Revision: 1429287 URL: http://svn.apache.org/viewvc?rev=1429287&view=rev Log: SOLR-3851: create a new core/delete an existing core should also update the main/left list of cores on the admin UI (merge r1429286) 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/app.js lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.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=1429287&r1=1429286&r2=1429287&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original) +++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Sat Jan 5 14:22:26 2013 @@ -202,6 +202,9 @@ Optimizations * SOLR-4261: Percentage Infos on Dashboard have a fixed width (steffkes) +* SOLR-3851: create a new core/delete an existing core should also update + the main/left list of cores on the admin UI (steffkes) + Bug Fixes ---------------------- Modified: lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js?rev=1429287&r1=1429286&r2=1429287&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js (original) +++ lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/app.js Sat Jan 5 14:22:26 2013 @@ -172,6 +172,110 @@ var solr_admin = function( app_config ) } }; + sort_cores_data = function sort_cores_data( cores_status ) + { + // build array of core-names for sorting + var core_names = []; + for( var core_name in cores_status ) + { + core_names.push( core_name ); + } + core_names.sort(); + + var core_count = core_names.length; + var cores = {}; + + for( var i = 0; i < core_count; i++ ) + { + var core_name = core_names[i]; + cores[core_name] = cores_status[core_name]; + } + + return cores; + }; + + this.set_cores_data = function set_cores_data( cores ) + { + self.cores_data = sort_cores_data( cores.status ); + + self.menu_element + .empty(); + + var core_count = 0; + for( var core_name in self.cores_data ) + { + core_count++; + var core_path = config.solr_path + '/' + core_name; + var classes = []; + + if( !environment_basepath ) + { + environment_basepath = core_path; + } + + if( cores.status[core_name]['isDefaultCore'] ) + { + classes.push( 'default' ); + } + + var core_tpl = '
  • ' + "\n" + + '

    ' + core_name + '

    ' + "\n" + + ' ' + "\n" + + '
    • '; + + self.menu_element + .append( core_tpl ); + } + + if( cores.initFailures ) + { + var failures = []; + for( var core_name in cores.initFailures ) + { + failures.push + ( + '
  • ' + + '' + core_name.esc() + ':' + "\n" + + cores.initFailures[core_name].esc() + "\n" + + '
    • ' + ); + } + + if( 0 !== failures.length ) + { + var init_failures = $( '#init-failures' ); + + init_failures.show(); + $( 'ul', init_failures ).html( failures.join( "\n" ) ); + } + } + + if( 0 === core_count ) + { + show_global_error + ( + '
    There are no SolrCores running.
    Using the Solr Admin UI currently requires at least one SolrCore.
    ' + ); + } // else: we have at least one core.... + }; + this.run = function() { $.ajax @@ -186,85 +290,17 @@ var solr_admin = function( app_config ) }, success : function( response ) { - self.cores_data = response.status; - var core_count = 0; + self.set_cores_data( response ); for( var core_name in response.status ) { - core_count++; var core_path = config.solr_path + '/' + core_name; - var schema = response['status'][core_name]['schema']; - var solrconfig = response['status'][core_name]['config']; - var classes = []; - if( !environment_basepath ) { environment_basepath = core_path; } - - if( response['status'][core_name]['isDefaultCore'] ) - { - classes.push( 'default' ); - } - - var core_tpl = '
  • ' + "\n" - + '

    ' + core_name + '

    ' + "\n" - + ' ' + "\n" - + '
    • '; - - self.menu_element - .append( core_tpl ); - } - - if( response.initFailures ) - { - var failures = []; - for( var core_name in response.initFailures ) - { - failures.push - ( - '
  • ' + - '' + core_name.esc() + ':' + "\n" + - response.initFailures[core_name].esc() + "\n" + - '
    • ' - ); - } - - if( 0 !== failures.length ) - { - var init_failures = $( '#init-failures' ); - - init_failures.show(); - $( 'ul', init_failures ).html( failures.join( "\n" ) ); - } } - if( 0 === core_count ) - { - show_global_error - ( - '
    There are no SolrCores running.
    Using the Solr Admin UI currently requires at least one SolrCore.
    ' - ); - return; - } // else: we have at least one core.... - var system_url = environment_basepath + '/admin/system?wt=json'; $.ajax ( Modified: lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js?rev=1429287&r1=1429286&r2=1429287&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js (original) +++ lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js Sat Jan 5 14:22:26 2013 @@ -36,7 +36,7 @@ sammy.bind }, success : function( response, text_status, xhr ) { - app.cores_data = response.status; + app.set_cores_data( response ); params.callback( app.cores_data ); }, error : function( xhr, text_status, error_thrown) @@ -189,7 +189,7 @@ sammy.get // index-data $( '.lastModified dd', index_data_element ) - .html( core_data.index.lastModified ); + .html( core_data.index.lastModified || '-' ); $( '.version dd', index_data_element ) .html( core_data.index.version ); @@ -201,7 +201,7 @@ sammy.get .html( core_data.index.maxDoc ); $( '.deletedDocs dd', index_data_element ) - .html( core_data.index.deletedDocs ); + .html( core_data.index.deletedDocs || '-' ); $( '.optimized dd', index_data_element ) .addClass( !core_data.index.hasDeletions ? 'ico-1' : 'ico-0' );