You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ep...@apache.org on 2020/10/15 18:37:40 UTC
[lucene-solr] branch branch_8x updated: SOLR-14483 (#1988)
This is an automated email from the ASF dual-hosted git repository.
epugh 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 3d0e2b0 SOLR-14483 (#1988)
3d0e2b0 is described below
commit 3d0e2b0fc8c92d1963f4b74b48632eb0c684990f
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Thu Oct 15 14:36:31 2020 -0400
SOLR-14483 (#1988)
* fixed broken select box
* converted tabs to spaces :sigh:
* Fix the refreshing of the scope
* track fix
Co-authored-by: sayan.das <sa...@gdn-commerce.com>
---
solr/CHANGES.txt | 2 ++
solr/webapp/web/css/angular/collections.css | 5 +++++
solr/webapp/web/js/angular/controllers/collections.js | 6 +++---
solr/webapp/web/partials/collections.html | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ae574f4..c2e449b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -159,6 +159,8 @@ Bug Fixes
* SOLR-14924: Some ReplicationHandler metrics are reported using incorrect types. (ab)
+* SOLR-14483: Fix empty drop down for adding replica in Admin UI (Sayan Das via Eric Pugh)
+
Other Changes
---------------------
diff --git a/solr/webapp/web/css/angular/collections.css b/solr/webapp/web/css/angular/collections.css
index 2645741..f6ddd05 100644
--- a/solr/webapp/web/css/angular/collections.css
+++ b/solr/webapp/web/css/angular/collections.css
@@ -123,6 +123,11 @@ limitations under the License.
padding-right: 3px;
}
+#content #collections .chosen-container.chosen-container-single
+{
+ width: 100% !important;
+}
+
#content #collections .actions form .buttons
{
padding-top: 10px;
diff --git a/solr/webapp/web/js/angular/controllers/collections.js b/solr/webapp/web/js/angular/controllers/collections.js
index 660baa0..2ac23b6 100644
--- a/solr/webapp/web/js/angular/controllers/collections.js
+++ b/solr/webapp/web/js/angular/controllers/collections.js
@@ -216,7 +216,7 @@ solrAdminApp.controller('CollectionsController',
$scope.nodes = [];
var children = data.tree[0].children;
for (var child in children) {
- $scope.nodes.push(children[child].data.title);
+ $scope.nodes.push(children[child].text);
}
});
};
@@ -225,7 +225,7 @@ solrAdminApp.controller('CollectionsController',
$scope.hideAll();
replica.showRemove = !replica.showRemove;
};
-
+
$scope.toggleRemoveShard = function(shard) {
$scope.hideAll();
shard.showRemove = !shard.showRemove;
@@ -261,7 +261,7 @@ solrAdminApp.controller('CollectionsController',
$timeout(function () {
shard.replicaAdded = false;
shard.showAdd = false;
- $$scope.refresh();
+ $scope.refresh();
}, 2000);
});
};
diff --git a/solr/webapp/web/partials/collections.html b/solr/webapp/web/partials/collections.html
index 198030c..9f7dc47 100644
--- a/solr/webapp/web/partials/collections.html
+++ b/solr/webapp/web/partials/collections.html
@@ -355,7 +355,7 @@ limitations under the License.
<select chosen ng-model="shard.replicaNodeName" ng-options="node for node in nodes" class="other">
<option value="">No specified node</option>
</select>
- node: {{shard.replicaNodeName}}
+ <span ng-if="shard.replicaNodeName">node: {{shard.replicaNodeName}}</span>
</p>
<p class="clearfix note error" ng-show="createReplicaMessage">