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 2015/04/10 15:16:37 UTC
svn commit: r1672643 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/webapp/ solr/webapp/web/js/angular/controllers/cloud.js
Author: janhoy
Date: Fri Apr 10 13:16:36 2015
New Revision: 1672643
URL: http://svn.apache.org/r1672643
Log:
SOLR-7369: AngularJS UI insufficient URLDecoding in cloud/tree view (merged)
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/webapp/ (props changed)
lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/cloud.js
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1672643&r1=1672642&r2=1672643&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Fri Apr 10 13:16:36 2015
@@ -46,6 +46,8 @@ Bug Fixes
* SOLR-7066: autoAddReplicas feature has bug when selecting replacement nodes. (Mark Miller)
+* SOLR-7369: AngularJS UI insufficient URLDecoding in cloud/tree view (janhoy)
+
Optimizations
----------------------
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/cloud.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/cloud.js?rev=1672643&r1=1672642&r2=1672643&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/cloud.js (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/cloud.js Fri Apr 10 13:16:36 2015
@@ -49,7 +49,7 @@ var treeSubController = function($scope,
$scope.showData = false;
$scope.showTreeLink = function(link) {
- var path = link.replace(/.*path=/, "").replace("%2F", "/");
+ var path = decodeURIComponent(link.replace(/.*[\\?&]path=([^&#]*).*/, "$1"));
Zookeeper.detail({path: path}, function(data) {
$scope.znode = data.znode;
var path = data.znode.path.split( '.' );