Merge pull request #267 from Jiri-Kremser/HAWKULAR-373

HAWKULAR-372 - removing the tenantId parameter -> fixing the 404 in J…
hawkular · Jun 26, 2015 · 9292e7f · 9292e7f
2 parents 54b75d6 + 6e52e09
commit 9292e7f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ui/console/src/main/scripts/plugins/directives/plugins/sidebar/ts/sidebarDirective.ts b/ui/console/src/main/scripts/plugins/directives/plugins/sidebar/ts/sidebarDirective.ts
@@ -93,7 +93,7 @@ module Sidebar {
 
     $scope.getUrlFromId = function(id) {
       if(!$scope.resource) {
-        $scope.resource = HawkularInventory.Resource.get({tenantId: $rootScope.currentPersona.id, environmentId: globalEnvironmentId, resourceId: id}, function(data) {
+        $scope.resource = HawkularInventory.Resource.get({environmentId: globalEnvironmentId, resourceId: id}, function(data) {
           $scope.resourceName = data.properties.url;
           });
       }

diff --git a/ui/console/src/main/scripts/plugins/directives/plugins/topbar/ts/topbarServices.ts b/ui/console/src/main/scripts/plugins/directives/plugins/topbar/ts/topbarServices.ts
@@ -32,7 +32,7 @@ module Topbar {
       var defaultOffset = 1 * 60 * 60  * 1000;
 
       var init = (tenantId: TenantId) => {
-        HawkularInventory.Resource.query({tenantId: tenantId, environmentId: globalEnvironmentId}, (resourceList) => {
+        HawkularInventory.Resource.query({environmentId: globalEnvironmentId}, (resourceList) => {
           $rootScope.hkResources = resourceList;
           for (var i = 0; i < resourceList.length; i++) {
             if(resourceList[i].id === $rootScope.hkParams.resourceId) {
@@ -52,7 +52,7 @@ module Topbar {
           $rootScope.hkEndTimestamp = $routeParams.endTimestamp || moment().valueOf();
           $rootScope.hkStartTimestamp =  moment().subtract($rootScope.hkParams.timeOffset, 'milliseconds').valueOf();
 
-          HawkularInventory.Resource.query({tenantId: tenantId, environmentId: globalEnvironmentId}, (resourceList) => {
+          HawkularInventory.Resource.query({environmentId: globalEnvironmentId}, (resourceList) => {
             $rootScope.hkResources = resourceList;
             for (var i = 0; i < resourceList.length; i++) {
               if(resourceList[i].id === $rootScope.hkParams.resourceId) {