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

fix(extension): bypass the error returned by plugin service during ex… (#1586) 

* fix(extension): bypass the error returned by plugin service during extension check

* feat(plugins): bypass the error returned by plugin service during plugin retrieval
pull/1602/head
Anthony Lapenna 2018-01-23 09:47:36 +01:00 committed by GitHub
parent 8c75f705e2
commit 173ea372c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/services/docker/pluginService.js
View File

@ -5,16 +5,17 @@ angular.module('portainer.services')
service.plugins = function() { service.plugins = function() {
var deferred = $q.defer(); var deferred = $q.defer();
var plugins = [];
Plugin.query({}).$promise Plugin.query({}).$promise
.then(function success(data) { .then(function success(data) {
var plugins = data.map(function (item) { for (var i = 0; i < data.length; i++) {
return new PluginViewModel(item); var plugin = new PluginViewModel(data[i]);
}); plugins.push(plugin);
deferred.resolve(plugins); }
}) })
.catch(function error(err) { .finally(function final() {
deferred.reject({ msg: 'Unable to retrieve plugins', err: err }); deferred.resolve(plugins);
}); });
return deferred.promise; return deferred.promise;
@ -61,7 +62,7 @@ angular.module('portainer.services')
}; };
service.loggingPlugins = function(systemOnly) { service.loggingPlugins = function(systemOnly) {
return servicePlugins(systemOnly, 'Log', 'docker.logdriver/1.0'); return servicePlugins(systemOnly, 'Log', 'docker.logdriver/1.0');
}; };
return service; return service;

5
app/services/extensionManager.js
View File

@ -23,10 +23,9 @@ angular.module('portainer.services')
if (_.includes(volumePlugins, 'cio:latest')) { if (_.includes(volumePlugins, 'cio:latest')) {
extensions.push('storidge'); extensions.push('storidge');
} }
deferred.resolve(extensions);
}) })
.catch(function error(err) { .finally(function final() {
deferred.reject({ msg: 'Unable to retrieve extensions', err: err }); deferred.resolve(extensions);
}); });
return deferred.promise; return deferred.promise;