diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 6340ca34cf4..b4026250be1 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -236,6 +236,8 @@ Other Changes * SOLR-9588: Remove Guava dependency from SolrJ (Ishan Chattopadhyaya, noble) +* SOLR-8140: Remove mentions of unimplemented admin-extra from the new Admin UI (Alexandre Rafalovitch) + ================== 6.2.1 ================== Bug Fixes diff --git a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java index 9b510fed665..49662375cd7 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java @@ -728,7 +728,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar //ensure that there is at least one query converter defined if (queryConverters.size() == 0) { - LOG.info("No queryConverter defined, using default converter"); + LOG.trace("No queryConverter defined, using default converter"); queryConverters.put("queryConverter", new SpellingQueryConverter()); } diff --git a/solr/webapp/web/css/angular/dashboard.css b/solr/webapp/web/css/angular/dashboard.css index c681bc862ae..734d62a9de6 100644 --- a/solr/webapp/web/css/angular/dashboard.css +++ b/solr/webapp/web/css/angular/dashboard.css @@ -123,11 +123,6 @@ limitations under the License. margin-top: 10px; } -#content #dashboard #admin-extra -{ - float: left; -} - #content #dashboard #healthcheck { float: right; @@ -152,7 +147,6 @@ limitations under the License. #content #dashboard #replication.master h2 { background-image: url( ../../img/ico/node-master.png ); } #content #dashboard #replication.slave h2 { background-image: url( ../../img/ico/node-slave.png ); } #content #dashboard #instance h2 { background-image: url( ../../img/ico/server.png ); } -#content #dashboard #admin-extra h2 { background-image: url( ../../img/ico/plus-button.png ); } #content #dashboard #collection h2 { background-image: url( ../../img/ico/book-open-text.png ); } #content #dashboard #shards h2 { background-image: url( ../../img/ico/documents-stack.png ); } @@ -182,4 +176,4 @@ limitations under the License. #dashboard #shards .shard .replica.odd { background-color: #fff; -} \ No newline at end of file +} diff --git a/solr/webapp/web/js/angular/controllers/core-overview.js b/solr/webapp/web/js/angular/controllers/core-overview.js index 710e6f24269..20f30e12bd8 100644 --- a/solr/webapp/web/js/angular/controllers/core-overview.js +++ b/solr/webapp/web/js/angular/controllers/core-overview.js @@ -139,86 +139,3 @@ function($scope, $rootScope, $routeParams, Luke, CoreSystem, Update, Replication $scope.refresh(); }); -/******* - -// @todo admin-extra - var core_basepath = this.active_core.attr( 'data-basepath' ); - var content_element = $( '#content' ); - - content_element - .removeClass( 'single' ); - - if( !app.core_menu.data( 'admin-extra-loaded' ) ) - { - app.core_menu.data( 'admin-extra-loaded', new Date() ); - - $.get - ( - core_basepath + '/admin/file/?file=admin-extra.menu-top.html&contentType=text/html;charset=utf-8', - function( menu_extra ) - { - app.core_menu - .prepend( menu_extra ); - } - ); - - $.get - ( - core_basepath + '/admin/file/?file=admin-extra.menu-bottom.html&contentType=text/html;charset=utf-8', - function( menu_extra ) - { - app.core_menu - .append( menu_extra ); - } - ); - } - - - -////////////////////////////////// ADMIN EXTRA - $.ajax - ( - { - url : core_basepath + '/admin/file/?file=admin-extra.html', - dataType : 'html', - context : $( '#admin-extra', dashboard_element ), - beforeSend : function( xhr, settings ) - { - $( 'h2', this ) - .addClass( 'loader' ); - - $( '.message', this ) - .show() - .html( 'Loading' ); - - $( '.content', this ) - .hide(); - }, - success : function( response, text_status, xhr ) - { - $( '.message', this ) - .hide() - .empty(); - - $( '.content', this ) - .show() - .html( response ); - }, - error : function( xhr, text_status, error_thrown) - { - this - .addClass( 'disabled' ); - - $( '.message', this ) - .show() - .html( 'We found no "admin-extra.html" file.' ); - }, - complete : function( xhr, text_status ) - { - $( 'h2', this ) - .removeClass( 'loader' ); - } - } - ); - -***/ diff --git a/solr/webapp/web/partials/core_overview.html b/solr/webapp/web/partials/core_overview.html index 5f86221d32b..3b92fc31470 100644 --- a/solr/webapp/web/partials/core_overview.html +++ b/solr/webapp/web/partials/core_overview.html @@ -205,23 +205,6 @@ limitations under the License. -
- -
- -

Admin Extra

- -
-
-
- -
- -
- -
- -