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

SOLR-8626: 404 error when clicking nodes in cloud graph view in angular UI. 

This closes #23
This commit is contained in:
Shalin Shekhar Mangar 2016-06-28 16:43:00 +05:30
parent 2a1ec2d4d6
commit 9cbd54087c
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -84,6 +84,8 @@ Bug Fixes
* SOLR-9237: DefaultSolrHighlighter.doHighlightingByFastVectorHighlighter can't be overidden (janhoy) * SOLR-9237: DefaultSolrHighlighter.doHighlightingByFastVectorHighlighter can't be overidden (janhoy)
* SOLR-8626: 404 error when clicking nodes in cloud graph view in angular UI. (janhoy, Trey Grainger via shalin)
Optimizations Optimizations
---------------------- ----------------------

46
solr/webapp/web/js/angular/controllers/cloud.js vendored
View File

@ -313,6 +313,32 @@ solrAdminApp.directive('graph', function(Constants) {
} }
}); });
function setNodeNavigationBehavior(node, view){
node
.attr('data-href', function (d) {
if (d.type == "node"){
return getNodeUrl(d, view);
}
else{
return "";
}
})
.on('click', function(d) {
if (d.data.type == "node"){
location.href = getNodeUrl(d, view);
}
});
}
function getNodeUrl(d, view){
var url = d.name + Constants.ROOT_URL + "#/~cloud";
if (view != undefined){
url += "?view=" + view;
}
return url;
}
var flatGraph = function(element, graphData, leafCount) { var flatGraph = function(element, graphData, leafCount) {
var w = element.width(), var w = element.width(),
h = leafCount * 20; h = leafCount * 20;
@ -359,13 +385,9 @@ solrAdminApp.directive('graph', function(Constants) {
.attr('text-anchor', function (d) { .attr('text-anchor', function (d) {
return 0 === d.depth ? 'end' : 'start'; return 0 === d.depth ? 'end' : 'start';
}) })
.attr('data-href', function (d) { .text(helper_node_text);
return d.name + Constants.ROOT_URL + "#/~cloud";
}) setNodeNavigationBehavior(node);
.text(helper_node_text)
.on('click', function(d,i) {
location.href = d.name+Constants.ROOT_URL+"#/~cloud";
});
}; };
var radialGraph = function(element, graphData, leafCount) { var radialGraph = function(element, graphData, leafCount) {
@ -417,13 +439,9 @@ solrAdminApp.directive('graph', function(Constants) {
.attr('transform', function (d) { .attr('transform', function (d) {
return d.x < 180 ? null : 'rotate(180)'; return d.x < 180 ? null : 'rotate(180)';
}) })
.attr('data-href', function (d) { .text(helper_node_text);
return d.name;
}) setNodeNavigationBehavior(node, "rgraph");
.text(helper_node_text)
.on('click', function(d,i) {
location.href = d.name+Constants.ROOT_URL+"#/~cloud";
});
} }
} }
}; };