From 9215d0f3f0e90e9566e568cdb01933cb7fec7449 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Sun, 7 Oct 2018 09:55:18 +0300 Subject: [PATCH] fix(volume-browser): move volume id to query params --- app/agent/rest/browse.js | 10 +++++----- app/agent/services/volumeBrowserService.js | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/agent/rest/browse.js b/app/agent/rest/browse.js index b4e8d53e0..9496768eb 100644 --- a/app/agent/rest/browse.js +++ b/app/agent/rest/browse.js @@ -1,22 +1,22 @@ angular.module('portainer.agent') .factory('Browse', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', function BrowseFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { 'use strict'; - return $resource(API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/browse/:id/:action', { + return $resource(API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/browse/:action', { endpointId: EndpointProvider.endpointID }, { ls: { - method: 'GET', isArray: true, params: { id: '@id', action: 'ls' } + method: 'GET', isArray: true, params: { action: 'ls' } }, get: { - method: 'GET', params: { id: '@id', action: 'get' }, + method: 'GET', params: { action: 'get' }, transformResponse: browseGetResponse }, delete: { - method: 'DELETE', params: { id: '@id', action: 'delete' } + method: 'DELETE', params: { action: 'delete' } }, rename: { - method: 'PUT', params: { id: '@id', action: 'rename' } + method: 'PUT', params: { action: 'rename' } } }); }]); diff --git a/app/agent/services/volumeBrowserService.js b/app/agent/services/volumeBrowserService.js index 22b020494..2a5c92f56 100644 --- a/app/agent/services/volumeBrowserService.js +++ b/app/agent/services/volumeBrowserService.js @@ -4,15 +4,15 @@ angular.module('portainer.agent') var service = {}; service.ls = function(volumeId, path) { - return Browse.ls({ 'id': volumeId, 'path': path }).$promise; + return Browse.ls({ volumeID: volumeId, path: path }).$promise; }; service.get = function(volumeId, path) { - return Browse.get({ 'id': volumeId, 'path': path }).$promise; + return Browse.get({ volumeID: volumeId, path: path }).$promise; }; service.delete = function(volumeId, path) { - return Browse.delete({ 'id': volumeId, 'path': path }).$promise; + return Browse.delete({ volumeID: volumeId, path: path }).$promise; }; service.rename = function(volumeId, path, newPath) { @@ -20,7 +20,7 @@ angular.module('portainer.agent') CurrentFilePath: path, NewFilePath: newPath }; - return Browse.rename({ 'id': volumeId }, payload).$promise; + return Browse.rename({ volumeID: volumeId }, payload).$promise; }; return service;