fix(networks): review how networks are loaded for usage in multiple views (#1104)

2017-08-11 09:46:55 +02:00
parent 3d5f9a76e4
commit d814f3aaa4
5 changed files with 67 additions and 90 deletions
@@ -305,10 +305,11 @@ function ($q, $scope, $state, Service, ServiceHelper, SecretHelper, SecretServic
  function initView() {
    $('#loadingViewSpinner').show();
    var apiVersion = $scope.applicationState.endpoint.apiVersion;
+
    $q.all({
      volumes: VolumeService.volumes(),
-      networks: NetworkService.retrieveSwarmNetworks(),
-      secrets: apiVersion >= 1.25 ? SecretService.secrets() : []
+      secrets: apiVersion >= 1.25 ? SecretService.secrets() : [],
+      networks: NetworkService.networks(true, true, false, false)
    })
    .then(function success(data) {
      $scope.availableVolumes = data.volumes;