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

fix(state): ensure API version >= 1.25 before extension check (#1594) 

* fix(state): ensure API version >= 1.25 before extension check
pull/1602/head
Anthony Lapenna 2018-01-23 09:50:14 +01:00 committed by GitHub
parent 0d0072a50e
commit 362f036a68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/stateManager.js
View File

@ -114,15 +114,17 @@ angular.module('portainer.services')
} }
$q.all({ $q.all({
info: SystemService.info(), info: SystemService.info(),
version: SystemService.version(), version: SystemService.version()
extensions: ExtensionManager.extensions()
}) })
.then(function success(data) { .then(function success(data) {
var endpointMode = InfoHelper.determineEndpointMode(data.info); var endpointMode = InfoHelper.determineEndpointMode(data.info);
var endpointAPIVersion = parseFloat(data.version.ApiVersion); var endpointAPIVersion = parseFloat(data.version.ApiVersion);
state.endpoint.mode = endpointMode; state.endpoint.mode = endpointMode;
state.endpoint.apiVersion = endpointAPIVersion; state.endpoint.apiVersion = endpointAPIVersion;
state.endpoint.extensions = data.extensions; return $q.when(endpointAPIVersion < 1.25 || ExtensionManager.extensions());
})
.then(function success(data) {
state.endpoint.extensions = data instanceof Array ? data : [];
LocalStorage.storeEndpointState(state.endpoint); LocalStorage.storeEndpointState(state.endpoint);
deferred.resolve(); deferred.resolve();
}) })