You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2016/04/19 20:18:02 UTC
[1/2] lucene-solr:master: SOLR-8990: Fix top term links from schema
browser page to use {!term} parser
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 7be7e8beb -> 10338a934
refs/heads/master 423ec0985 -> c574a91e3
SOLR-8990: Fix top term links from schema browser page to use {!term} parser
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c574a91e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c574a91e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c574a91e
Branch: refs/heads/master
Commit: c574a91e3b3b64fd1cb61b0463f3019689f4f4a5
Parents: 423ec09
Author: Chris Hostetter <ho...@apache.org>
Authored: Tue Apr 19 11:17:10 2016 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Tue Apr 19 11:17:10 2016 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/webapp/web/js/angular/app.js | 3 +++
solr/webapp/web/partials/schema.html | 2 +-
3 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c574a91e/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d4806cf..14617eb 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -137,6 +137,8 @@ Bug Fixes
* SOLR-8983: Cleanup clusterstate and replicas for a failed create collection request
(Varun Thacker, Anshum Gupta)
+* SOLR-8990: Fix top term links from schema browser page to use {!term} parser (hossman)
+
Optimizations
----------------------
* SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c574a91e/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 c67115c..8a1fe26 100644
--- a/solr/webapp/web/js/angular/app.js
+++ b/solr/webapp/web/js/angular/app.js
@@ -143,6 +143,9 @@ solrAdminApp.config([
IS_COLLECTION_PAGE: 3,
ROOT_URL: "/"
})
+.filter('uriencode', function() {
+ return window.encodeURIComponent;
+})
.filter('highlight', function($sce) {
return function(input, lang) {
if (lang && input && lang!="text") return hljs.highlight(lang, input).value;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c574a91e/solr/webapp/web/partials/schema.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/partials/schema.html b/solr/webapp/web/partials/schema.html
index b91a92c..ca626fd 100644
--- a/solr/webapp/web/partials/schema.html
+++ b/solr/webapp/web/partials/schema.html
@@ -315,7 +315,7 @@ limitations under the License.
<li class="clearfix" ng-repeat="countGroup in termInfo.topTerms">
<p><span>{{countGroup.count}}</span></p>
<ul>
- <li ng-repeat="term in countGroup.terms" ng-class="{odd:$odd}"><a href="#/{{core}}/query?q={{name}}:{{term}}">{{term}}</a></li>
+ <li ng-repeat="term in countGroup.terms" ng-class="{odd:$odd}"><a ng-href="#/{{core}}/query?q=%7B!term+f%3D{{name | uriencode}}%7D{{term | uriencode}}">{{term}}</a></li>
</ul>
</li>
[2/2] lucene-solr:branch_6x: SOLR-8990: Fix top term links from
schema browser page to use {!term} parser
Posted by ho...@apache.org.
SOLR-8990: Fix top term links from schema browser page to use {!term} parser
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/10338a93
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/10338a93
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/10338a93
Branch: refs/heads/branch_6x
Commit: 10338a934fafe0ce597651d220da1d2adfc2eab1
Parents: 7be7e8b
Author: Chris Hostetter <ho...@apache.org>
Authored: Tue Apr 19 11:17:10 2016 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Tue Apr 19 11:17:24 2016 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/webapp/web/js/angular/app.js | 3 +++
solr/webapp/web/partials/schema.html | 2 +-
3 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/10338a93/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 587b5bf..9d2064c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -102,6 +102,8 @@ Bug Fixes
* SOLR-8983: Cleanup clusterstate and replicas for a failed create collection request
(Varun Thacker, Anshum Gupta)
+* SOLR-8990: Fix top term links from schema browser page to use {!term} parser (hossman)
+
Optimizations
----------------------
* SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/10338a93/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 4238fd4..84b9ed5 100644
--- a/solr/webapp/web/js/angular/app.js
+++ b/solr/webapp/web/js/angular/app.js
@@ -139,6 +139,9 @@ solrAdminApp.config([
IS_COLLECTION_PAGE: 3,
ROOT_URL: "/"
})
+.filter('uriencode', function() {
+ return window.encodeURIComponent;
+})
.filter('highlight', function($sce) {
return function(input, lang) {
if (lang && input && lang!="text") return hljs.highlight(lang, input).value;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/10338a93/solr/webapp/web/partials/schema.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/partials/schema.html b/solr/webapp/web/partials/schema.html
index b91a92c..ca626fd 100644
--- a/solr/webapp/web/partials/schema.html
+++ b/solr/webapp/web/partials/schema.html
@@ -315,7 +315,7 @@ limitations under the License.
<li class="clearfix" ng-repeat="countGroup in termInfo.topTerms">
<p><span>{{countGroup.count}}</span></p>
<ul>
- <li ng-repeat="term in countGroup.terms" ng-class="{odd:$odd}"><a href="#/{{core}}/query?q={{name}}:{{term}}">{{term}}</a></li>
+ <li ng-repeat="term in countGroup.terms" ng-class="{odd:$odd}"><a ng-href="#/{{core}}/query?q=%7B!term+f%3D{{name | uriencode}}%7D{{term | uriencode}}">{{term}}</a></li>
</ul>
</li>