You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ar...@apache.org on 2016/11/06 03:12:18 UTC
lucene-solr:master: SOLR-9624: Do not highlight CSV output
Repository: lucene-solr
Updated Branches:
refs/heads/master 4b3e7f2fe -> 94c796968
SOLR-9624: Do not highlight CSV output
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/94c79696
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/94c79696
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/94c79696
Branch: refs/heads/master
Commit: 94c796968ae9a448aa89f363f055ca4a2958ab10
Parents: 4b3e7f2
Author: Alexandre Rafalovitch <ar...@apache.org>
Authored: Sun Nov 6 14:09:55 2016 +1100
Committer: Alexandre Rafalovitch <ar...@apache.org>
Committed: Sun Nov 6 14:09:55 2016 +1100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/webapp/web/js/angular/app.js | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/94c79696/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e13d3cb..1109ef7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -120,6 +120,8 @@ Bug Fixes
* SOLR-9716: RecoveryStrategy sends prep recovery command without setting read time out which can cause
replica recovery to hang indefinitely on network partitions. (Cao Manh Dat, shalin)
+* SOLR-9624: In Admin UI, do not attempt to highlight CSV output (Alexandre Rafalovitch)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/94c79696/solr/webapp/web/js/angular/app.js
----------------------------------------------------------------------
diff --git a/solr/webapp/web/js/angular/app.js b/solr/webapp/web/js/angular/app.js
index e7491fe..e86b55f 100644
--- a/solr/webapp/web/js/angular/app.js
+++ b/solr/webapp/web/js/angular/app.js
@@ -148,7 +148,7 @@ solrAdminApp.config([
})
.filter('highlight', function($sce) {
return function(input, lang) {
- if (lang && input && lang!="txt") return hljs.highlight(lang, input).value;
+ if (lang && input && lang!="txt" && lang!="csv") return hljs.highlight(lang, input).value;
return input;
}
})