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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Noble Paul 2016-10-04 00:18:52 +05:30
parent 8d1f45864e 472e8048ad
commit e7ade287e3
5 changed files with 4 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -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

2
solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
View File

@ -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());
}

6
solr/webapp/web/css/angular/dashboard.css
View File

@ -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 ); }

83
solr/webapp/web/js/angular/controllers/core-overview.js vendored
View File

@ -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' );
}
}
);
***/

17
solr/webapp/web/partials/core_overview.html
View File

@ -205,23 +205,6 @@ limitations under the License.
</div>
</div>
<div class="clearfix">
<div class="block" id="admin-extra">
<h2><span>Admin Extra</span></h2>
<div class="message-container">
<div class="message"></div>
</div>
<div class="content">
</div>
</div>
</div>
</div>