You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2021/03/09 23:40:16 UTC
[lucene-solr] branch branch_8x updated: SOLR-15216 Fix for Invalid
Reference to data.followers in Admin UI (#2456)
This is an automated email from the ASF dual-hosted git repository.
tflobbe pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new d76dfaf SOLR-15216 Fix for Invalid Reference to data.followers in Admin UI (#2456)
d76dfaf is described below
commit d76dfaf68a86fe3609315f2d37a1edbe43f6b439
Author: Dean Pearce <he...@deanpearce.me>
AuthorDate: Tue Mar 9 18:40:00 2021 -0500
SOLR-15216 Fix for Invalid Reference to data.followers in Admin UI (#2456)
* SOLR-15216 Fix for incorrect reference to data.followers when API in 8.x returns data.slave.
* SOLR-15216 Update CHANGES.txt with bug fix.
---
solr/CHANGES.txt | 4 +++-
solr/webapp/web/js/angular/controllers/replication.js | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 75e6395..7d80887 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -40,7 +40,7 @@ Improvements
* SOLR-15191: Enhance hash method of JSON faceting to support EnumFieldType and perhaps some other/custom field types
too. (Thomas Wöckinger, David Smiley)
-* SOLR-15194: Allow Solr to make outbound non SSL calls to a JWT IDP via -Dsolr.auth.jwt.allowOutboundHttp=true property. (Eric Pugh)
+* SOLR-15194: Allow Solr to make outbound non SSL calls to a JWT IDP via -Dsolr.auth.jwt.allowOutboundHttp=true property. (Eric Pugh)
* SOLR-15154: Let Http2SolrClient pass Basic Auth credentials to all requests (Tomás Fernández Löbbe)
@@ -64,6 +64,8 @@ Bug Fixes
* SOLR-15191: Fix JSON Faceting on EnumFieldType if allBuckets, numBuckets or missing is set.
(Thomas Wöckinger, David Smiley)
+* SOLR-15216: Fix for Invalid Reference to data.followers in Admin UI. (Dean Pearce)
+
Other Changes
---------------------
* SOLR-15118: Deprecate CollectionAdminRequest.getV2Request(). (Jason Gerlowski)
diff --git a/solr/webapp/web/js/angular/controllers/replication.js b/solr/webapp/web/js/angular/controllers/replication.js
index 21e72ba..4c83fafc 100644
--- a/solr/webapp/web/js/angular/controllers/replication.js
+++ b/solr/webapp/web/js/angular/controllers/replication.js
@@ -195,7 +195,7 @@ var getFollowerSettings = function(data) {
} else if (!settings.isPollingDisabled && settings.pollInterval) {
if( settings.nextExecutionAt ) {
settings.nextExecutionAtEpoch = parseDateToEpoch(settings.nextExecutionAt);
- settings.currentTime = parseDateToEpoch(data.follower.currentDate);
+ settings.currentTime = parseDateToEpoch(data.slave.currentDate);
if( settings.nextExecutionAtEpoch > settings.currentTime) {
settings.isApprox = false;