diff --git a/app/docker/views/services/create/createServiceController.js b/app/docker/views/services/create/createServiceController.js index d61cfdfff..738b215b5 100644 --- a/app/docker/views/services/create/createServiceController.js +++ b/app/docker/views/services/create/createServiceController.js @@ -31,7 +31,6 @@ angular.module('portainer.docker').controller('CreateServiceController', [ 'HttpRequestHelper', 'NodeService', 'WebhookService', - 'EndpointProvider', 'endpoint', function ( $q, @@ -57,9 +56,10 @@ angular.module('portainer.docker').controller('CreateServiceController', [ HttpRequestHelper, NodeService, WebhookService, - EndpointProvider, endpoint ) { + $scope.endpoint = endpoint; + $scope.formValues = { Name: '', RegistryModel: new PorImageRegistryModel(), @@ -493,7 +493,7 @@ angular.module('portainer.docker').controller('CreateServiceController', [ const resourceControl = data.Portainer.ResourceControl; const userId = Authentication.getUserDetails().ID; const rcPromise = ResourceControlService.applyResourceControl(userId, accessControlData, resourceControl); - const webhookPromise = $q.when($scope.formValues.Webhook && WebhookService.createServiceWebhook(serviceId, EndpointProvider.endpointID())); + const webhookPromise = $q.when(endpoint.Type !== 4 && $scope.formValues.Webhook && WebhookService.createServiceWebhook(serviceId, endpoint.ID)); return $q.all([rcPromise, webhookPromise]); }) .then(function success() { diff --git a/app/docker/views/services/create/createservice.html b/app/docker/views/services/create/createservice.html index 746b8e7b8..36e16120b 100644 --- a/app/docker/views/services/create/createservice.html +++ b/app/docker/views/services/create/createservice.html @@ -95,19 +95,21 @@ -
- Webhooks -
-
-
- - +
+
+ Webhooks +
+
+
+ + +