You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2016/07/28 22:33:39 UTC
lucene-solr:branch_6x: SOLR-8645: managed-schema is now syntax
highlighted in cloud->Tree view. This closes #57 (cherry picked from commit
1fb4c5d)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 0f26f11f6 -> 46e183dee
SOLR-8645: managed-schema is now syntax highlighted in cloud->Tree view. This closes #57
(cherry picked from commit 1fb4c5d)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/46e183de
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/46e183de
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/46e183de
Branch: refs/heads/branch_6x
Commit: 46e183deea90f8a464843ca9a3fc76f258072256
Parents: 0f26f11
Author: Jan H�ydahl <ja...@apache.org>
Authored: Fri Jul 29 00:03:24 2016 +0200
Committer: Jan H�ydahl <ja...@apache.org>
Committed: Fri Jul 29 00:07:01 2016 +0200
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/webapp/web/js/angular/controllers/cloud.js | 5 +++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46e183de/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 29d60d0..56d10e8 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -141,6 +141,8 @@ Bug Fixes
* SOLR-8596: Web UI doesn't correctly generate queries which include local parameters (Alexandre Rafalovitch, janhoy)
+* SOLR-8645: managed-schema is now syntax highlighted in cloud->Tree view (Alexandre Rafalovitch via janhoy)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46e183de/solr/webapp/web/js/angular/controllers/cloud.js
----------------------------------------------------------------------
diff --git a/solr/webapp/web/js/angular/controllers/cloud.js b/solr/webapp/web/js/angular/controllers/cloud.js
index c150c5a..2d0dae0 100644
--- a/solr/webapp/web/js/angular/controllers/cloud.js
+++ b/solr/webapp/web/js/angular/controllers/cloud.js
@@ -55,6 +55,11 @@ var treeSubController = function($scope, Zookeeper) {
var path = data.znode.path.split( '.' );
if(path.length >1) {
$scope.lang = path.pop();
+ } else {
+ var lastPathElement = data.znode.path.split( '/' ).pop();
+ if (lastPathElement == "managed-schema") {
+ $scope.lang = "xml";
+ }
}
$scope.showData = true;
});