Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-14483 (#1988)

Eric Pughd7e58ede0ed2
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d42675dd810..261e24bfc65 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -265,6 +265,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 2645741a33d..f6ddd052649 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 2d1ce5c6127..6f956294f92 100644
--- a/solr/webapp/web/js/angular/controllers/collections.js
+++ b/solr/webapp/web/js/angular/controllers/collections.js
@@ -212,7 +212,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);
}
});
};
@@ -221,7 +221,7 @@ solrAdminApp.controller('CollectionsController',
$scope.hideAll();
replica.showRemove = !replica.showRemove;
};
-
+
$scope.toggleRemoveShard = function(shard) {
$scope.hideAll();
shard.showRemove = !shard.showRemove;
@@ -257,7 +257,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 d3bbf56e926..75073e40694 100644
--- a/solr/webapp/web/partials/collections.html
+++ b/solr/webapp/web/partials/collections.html
@@ -335,7 +335,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">