From 40f504022c84401cf3377dfe57da1734abc24c34 Mon Sep 17 00:00:00 2001 From: David Kaltschmidt Date: Mon, 30 Nov 2015 12:59:53 +0100 Subject: [PATCH] dont send topology options when requesting node details --- client/app/scripts/actions/app-actions.js | 12 ++++-------- client/app/scripts/utils/web-api-utils.js | 6 ++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/client/app/scripts/actions/app-actions.js b/client/app/scripts/actions/app-actions.js index 1e0223c17..c62ab43cd 100644 --- a/client/app/scripts/actions/app-actions.js +++ b/client/app/scripts/actions/app-actions.js @@ -23,8 +23,7 @@ module.exports = { ); WebapiUtils.getNodeDetails( AppStore.getCurrentTopologyUrl(), - AppStore.getSelectedNodeId(), - AppStore.getActiveTopologyOptions() + AppStore.getSelectedNodeId() ); }, @@ -43,8 +42,7 @@ module.exports = { RouterUtils.updateRoute(); WebapiUtils.getNodeDetails( AppStore.getCurrentTopologyUrl(), - AppStore.getSelectedNodeId(), - AppStore.getActiveTopologyOptions() + AppStore.getSelectedNodeId() ); }, @@ -162,8 +160,7 @@ module.exports = { ); WebapiUtils.getNodeDetails( AppStore.getCurrentTopologyUrl(), - AppStore.getSelectedNodeId(), - AppStore.getActiveTopologyOptions() + AppStore.getSelectedNodeId() ); }, @@ -195,8 +192,7 @@ module.exports = { ); WebapiUtils.getNodeDetails( AppStore.getCurrentTopologyUrl(), - AppStore.getSelectedNodeId(), - AppStore.getActiveTopologyOptions() + AppStore.getSelectedNodeId() ); } }; diff --git a/client/app/scripts/utils/web-api-utils.js b/client/app/scripts/utils/web-api-utils.js index aed90162b..4f33e8883 100644 --- a/client/app/scripts/utils/web-api-utils.js +++ b/client/app/scripts/utils/web-api-utils.js @@ -100,11 +100,9 @@ function getTopology(topologyUrl, options) { } } -function getNodeDetails(topologyUrl, nodeId, options) { - const optionsQuery = buildOptionsQuery(options); - +function getNodeDetails(topologyUrl, nodeId) { if (topologyUrl && nodeId) { - const url = [topologyUrl, '/', encodeURIComponent(nodeId), '?', optionsQuery] + const url = [topologyUrl, '/', encodeURIComponent(nodeId)] .join('').substr(1); reqwest({ url: url,