You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/10/09 21:26:45 UTC
[2/8] stratos git commit: Changing metering dashboard url and
encoding it
Changing metering dashboard url and encoding it
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a5b0061f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a5b0061f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a5b0061f
Branch: refs/heads/stratos-4.1.x
Commit: a5b0061f0d34333d7c64e07be36613f8f0a41081
Parents: daf30f4
Author: Thanuja <th...@wso2.com>
Authored: Fri Oct 9 00:06:26 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Sat Oct 10 00:51:09 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/js/custom/applications_topology.js | 4 ++--
.../distribution/src/main/conf/cartridge-config.properties | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5b0061f/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
index 40bdfae..afd7f92 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_topology.js
@@ -611,12 +611,12 @@ $("a[href='#application']").on('shown.bs.tab', function (e) {
function showApplicationUsage(id) {
- window.location = meteringDashboardUrl + '?applicationId=' + applicationId;
+ window.location = encodeURI(meteringDashboardUrl + '?applicationId=' + applicationId);
}
function showClusterUsage(id, type) {
var clusterId = id;
- window.location = meteringDashboardUrl + '?applicationId=' + applicationId + '&clusterId=' + clusterId;
+ window.location = encodeURI(meteringDashboardUrl + '?applicationId=' + applicationId + '&clusterId=' + clusterId);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5b0061f/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties b/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties
index c96edb5..a3fd8ee 100644
--- a/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties
+++ b/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties
@@ -22,7 +22,7 @@
autoscaler.service.url=https://localhost:9443/services/AutoscalerService/
cloud.controller.service.url=https://localhost:9443/services/CloudControllerService/
stratos.manager.service.url=https://localhost:9443/services/StratosManagerService/
-das.metering.dashboard.url=https://localhost:9444/portal/dashboards/stratos-metering-dashboard/
+das.metering.dashboard.url=https://localhost:9444/portal/dashboards/stratos-metering-dashboard
puppet.ip=127.0.0.1
puppet.hostname=puppet.stratos.apache.org
puppet.dns.available=false