Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15637: Set .tls for security UI based on data.security.tls in response from server (#299)

Timothy Potterdb5fb5ace574
diff --git a/solr/webapp/web/js/angular/controllers/security.js b/solr/webapp/web/js/angular/controllers/security.js
index aa7ecd94534..4a72e5cdc20 100644
--- a/solr/webapp/web/js/angular/controllers/security.js
+++ b/solr/webapp/web/js/angular/controllers/security.js
@@ -169,6 +169,7 @@ solrAdminApp.controller('SecurityController', function ($scope, $timeout, $cooki
$scope.refresh = function () {
$scope.hideAll();
+ $scope.tls = false;
$scope.blockUnknown = "false"; // default setting
$scope.realmName = "solr";
$scope.forwardCredentials = "false";
@@ -186,6 +187,7 @@ solrAdminApp.controller('SecurityController', function ($scope, $timeout, $cooki
$scope.permFilterTypes = ["", "name", "role", "path", "collection"];
System.get(function(data) {
+ $scope.tls = data.security ? data.security["tls"] : false;
$scope.authenticationPlugin = data.security ? data.security["authenticationPlugin"] : null;
$scope.authorizationPlugin = data.security ? data.security["authorizationPlugin"] : null;
$scope.myRoles = data.security ? data.security["roles"] : [];