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

SOLR-14287: Admin UI Properties screen does not show colons (#1300)

This commit is contained in:
Jan Høydahl 2020-02-28 10:32:09 +01:00 committed by GitHub
parent 988ce9bff7
commit 198d9db674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/CHANGES.txt
View File

@ -188,10 +188,12 @@ Bug Fixes
* SOLR-14250: Do not log error when trying to consume non-existing input stream due to Expect: 100-continue (janhoy)
* SOLR-13411: Deny atomic update for route.field, uniqueKey, version and throw exception. (Dr Oleg Savrasov via Mikhail Khludnev)
* SOLR-13411: Deny atomic update for route.field, uniqueKey, version and throw exception. (Dr Oleg Savrasov via Mikhail Khludnev)
* SOLR-14252: Avoid NullPointerException in AggregateMetric. (Andy Webb via ab)
* SOLR-14287: Admin UI Properties screen does not show colons (janhoy)
Other Changes
---------------------

20
solr/webapp/web/js/angular/controllers/java-properties.js vendored
View File

@ -25,18 +25,18 @@ solrAdminApp.controller('JavaPropertiesController',
var props = [];
for (var key in sysprops) {
var value = sysprops[key];
var key = key.replace(/\./g, '.​');
if (key.indexOf(".path")!=-1 || key.indexOf(".dirs")) {
var values = [];
var parts = value.split(sep);
for (var i in parts) {
values.push({pos:i, value:parts[i]})
}
props.push({name: key, values: values});
} else {
props.push({name: key, values: [value]});
var values = value.split(sep);
if (value === sep) {
values = [':'];
}
props.push({
name: key.replace(/\./g, '.​')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;'),
values: values
});
}
$scope.pathSeparator = sep;
$scope.props = props;
});
};

2
solr/webapp/web/partials/java-properties.html
View File

@ -19,7 +19,7 @@ limitations under the License.
<li ng-class="{odd:$odd}" ng-repeat="prop in props | orderObjectBy:'name'">
<dl class="clearfix">
<dt ng-bind-html="prop.name | unsafe"></dt>
<dd ng-class="{odd:$odd, multi:props.length&gt;1}" ng-repeat="value in prop.values">{{value.value}}</dd>
<dd ng-class="{odd:$odd, multi:props.length&gt;1}"><span ng-repeat-start="val in prop.values">{{val}}</span><span ng-repeat-end ng-if="!$last">{{pathSeparator}}{{"&#8203;"}}</span></dd>
</dl>
</li>
</ul>