Portainer
/
portainer
mirror of https://github.com/portainer/portainer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(dashboard): do not display stack and service info when connected to Swarm worker (#1319)

pull/1321/head
Anthony Lapenna 2017-10-24 19:17:07 +02:00 committed by GitHub
parent 11feae19b7
commit aa32213f7c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/dashboard/dashboard.html
View File

@ -85,7 +85,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-6" ng-if="applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"> <div class="col-xs-12 col-md-6" ng-if="applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE' && applicationState.endpoint.mode.role === 'MANAGER'">
<a ui-sref="stacks"> <a ui-sref="stacks">
<rd-widget> <rd-widget>
<rd-widget-body> <rd-widget-body>
@ -98,7 +98,7 @@
</rd-widget> </rd-widget>
</a> </a>
</div> </div>
<div class="col-xs-12 col-md-6" ng-if="applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"> <div class="col-xs-12 col-md-6" ng-if="applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE' && applicationState.endpoint.mode.role === 'MANAGER'">
<a ui-sref="services"> <a ui-sref="services">
<rd-widget> <rd-widget>
<rd-widget-body> <rd-widget-body>

5
app/components/dashboard/dashboardController.js
View File

@ -68,6 +68,7 @@ function ($scope, $q, Container, ContainerHelper, Image, Network, Volume, System
$('#loadingViewSpinner').show(); $('#loadingViewSpinner').show();
var endpointProvider = $scope.applicationState.endpoint.mode.provider; var endpointProvider = $scope.applicationState.endpoint.mode.provider;
var endpointRole = $scope.applicationState.endpoint.mode.role;
$q.all([ $q.all([
Container.query({all: 1}).$promise, Container.query({all: 1}).$promise,
@ -75,8 +76,8 @@ function ($scope, $q, Container, ContainerHelper, Image, Network, Volume, System
Volume.query({}).$promise, Volume.query({}).$promise,
Network.query({}).$promise, Network.query({}).$promise,
SystemService.info(), SystemService.info(),
endpointProvider === 'DOCKER_SWARM_MODE' ? ServiceService.services() : [], endpointProvider === 'DOCKER_SWARM_MODE' && endpointRole === 'MANAGER' ? ServiceService.services() : [],
endpointProvider === 'DOCKER_SWARM_MODE' ? StackService.stacks(true) : [] endpointProvider === 'DOCKER_SWARM_MODE' && endpointRole === 'MANAGER' ? StackService.stacks(true) : []
]).then(function (d) { ]).then(function (d) {
prepareContainerData(d[0]); prepareContainerData(d[0]);
prepareImageData(d[1]); prepareImageData(d[1]);