Merge pull request #733 from rasika/improvement_getuser

Fixing typo and getCarbonUser() replaced with context.user
4.x.x
Amal Gunatilake 8 years ago committed by GitHub
commit a4072615af

@ -519,7 +519,7 @@
{{/zone}} {{/zone}}
{{#zone "bottomJs"}} {{#zone "bottomJs"}}
<script id="device-listing" data-analitics-url="{{analiticsURL}}" data-current-user="{{@user.username}}" data-device-types="{{deviceTypes}}" <script id="device-listing" data-analitics-url="{{analyticsURL}}" data-current-user="{{@user.username}}" data-device-types="{{deviceTypes}}"
type="text/x-handlebars-template"></script> type="text/x-handlebars-template"></script>
{{js "js/listing.js"}} {{js "js/listing.js"}}
{{/zone}} {{/zone}}

@ -80,10 +80,9 @@ function onRequest(context) {
} }
var mdmProps = require("/app/modules/conf-reader/main.js")["conf"]; var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
var cUser = userModule.getCarbonUser(); var analyticsServer = mdmProps["dashboardServerURL"];
var analiticsServer = mdmProps["dashboardServerURL"]; var analyticsURL = analyticsServer + "/portal/t/" + context.user.userDomain + "/dashboards/android-iot/battery?owner=" + context.user.username + "&deviceId=";
var analiticsURL = analiticsServer + "/portal/t/" + cUser.userDomain + "/dashboards/android-iot/battery?owner=" + cUser.username + "&deviceId="; viewModel.analyticsURL = analyticsURL;
viewModel.analiticsURL = analiticsURL;
return viewModel; return viewModel;
} }

Loading…
Cancel
Save