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

fix(rest): fix an issue with rest factories using $http (#1077)

pull/1079/merge
Anthony Lapenna 2017-07-27 10:46:29 +02:00 committed by GitHub
parent 252e05e963
commit 5110f83fae
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/rest/docker/containerLogs.js
View File

@ -5,7 +5,7 @@ angular.module('portainer.rest')
get: function (id, params, callback) { get: function (id, params, callback) {
$http({ $http({
method: 'GET', method: 'GET',
url: API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/containers/' + id + '/logs', url: API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/docker/containers/' + id + '/logs',
params: { params: {
'stdout': params.stdout || 0, 'stdout': params.stdout || 0,
'stderr': params.stderr || 0, 'stderr': params.stderr || 0,
@ -13,7 +13,7 @@ angular.module('portainer.rest')
'tail': params.tail || 'all' 'tail': params.tail || 'all'
} }
}).success(callback).error(function (data, status, headers, config) { }).success(callback).error(function (data, status, headers, config) {
console.log(error, data); console.log(data);
}); });
} }
}; };

6
app/rest/docker/containerTop.js
View File

@ -5,11 +5,13 @@ angular.module('portainer.rest')
get: function (id, params, callback, errorCallback) { get: function (id, params, callback, errorCallback) {
$http({ $http({
method: 'GET', method: 'GET',
url: API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/containers/' + id + '/top', url: API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/docker/containers/' + id + '/top',
params: { params: {
ps_args: params.ps_args ps_args: params.ps_args
} }
}).success(callback); }).success(callback).error(function (data, status, headers, config) {
console.log(data);
});
} }
}; };
}]); }]);

4
app/rest/docker/serviceLogs.js
View File

@ -5,7 +5,7 @@ angular.module('portainer.rest')
get: function (id, params, callback) { get: function (id, params, callback) {
$http({ $http({
method: 'GET', method: 'GET',
url: API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/services/' + id + '/logs', url: API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/docker/services/' + id + '/logs',
params: { params: {
'stdout': params.stdout || 0, 'stdout': params.stdout || 0,
'stderr': params.stderr || 0, 'stderr': params.stderr || 0,
@ -13,7 +13,7 @@ angular.module('portainer.rest')
'tail': params.tail || 'all' 'tail': params.tail || 'all'
} }
}).success(callback).error(function (data, status, headers, config) { }).success(callback).error(function (data, status, headers, config) {
console.log(error, data); console.log(data);
}); });
} }
}; };