#476 fix(UX): Rename 'local' endpoint doesn't overwrite "unix://" (#477)

* #476 fix(UX): Rename 'local' endpoint doesn't overwrite "unix://"

* #477 fix(PR): Rename 'TYPE' in 'type'
pull/520/head
Kilhog 8 years ago committed by Anthony Lapenna
parent 27e584fc14
commit cd26051144

@ -19,7 +19,8 @@ function ($scope, $state, $stateParams, $filter, EndpointService, Messages) {
var TLSCACert = $scope.formValues.TLSCACert !== $scope.endpoint.TLSCACert ? $scope.formValues.TLSCACert : null; var TLSCACert = $scope.formValues.TLSCACert !== $scope.endpoint.TLSCACert ? $scope.formValues.TLSCACert : null;
var TLSCert = $scope.formValues.TLSCert !== $scope.endpoint.TLSCert ? $scope.formValues.TLSCert : null; var TLSCert = $scope.formValues.TLSCert !== $scope.endpoint.TLSCert ? $scope.formValues.TLSCert : null;
var TLSKey = $scope.formValues.TLSKey !== $scope.endpoint.TLSKey ? $scope.formValues.TLSKey : null; var TLSKey = $scope.formValues.TLSKey !== $scope.endpoint.TLSKey ? $scope.formValues.TLSKey : null;
EndpointService.updateEndpoint(ID, name, URL, TLS, TLSCACert, TLSCert, TLSKey).then(function success(data) { var type = $scope.endpointType;
EndpointService.updateEndpoint(ID, name, URL, TLS, TLSCACert, TLSCert, TLSKey, type).then(function success(data) {
Messages.send("Endpoint updated", $scope.endpoint.Name); Messages.send("Endpoint updated", $scope.endpoint.Name);
$state.go('endpoints'); $state.go('endpoints');
}, function error(err) { }, function error(err) {

@ -374,11 +374,11 @@ angular.module('portainer.services', ['ngResource', 'ngSanitize'])
endpoints: function() { endpoints: function() {
return Endpoints.query({}).$promise; return Endpoints.query({}).$promise;
}, },
updateEndpoint: function(ID, name, URL, TLS, TLSCAFile, TLSCertFile, TLSKeyFile) { updateEndpoint: function(ID, name, URL, TLS, TLSCAFile, TLSCertFile, TLSKeyFile, type) {
var endpoint = { var endpoint = {
id: ID, id: ID,
Name: name, Name: name,
URL: "tcp://" + URL, URL: type === 'local' ? ("unix://" + URL) : ("tcp://" + URL),
TLS: TLS TLS: TLS
}; };
var deferred = $q.defer(); var deferred = $q.defer();

Loading…
Cancel
Save