Permalink
Browse files

#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'
  • Loading branch information...
1 parent 27e584f commit cd260511442429621c38c2932c9d0077ce3cc612 @Kilhog Kilhog committed with deviantony Jan 12, 2017
Showing with 4 additions and 3 deletions.
  1. +2 −1 app/components/endpoint/endpointController.js
  2. +2 −2 app/shared/services.js
@@ -19,7 +19,8 @@ function ($scope, $state, $stateParams, $filter, EndpointService, Messages) {
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 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);
$state.go('endpoints');
}, function error(err) {
@@ -374,11 +374,11 @@ angular.module('portainer.services', ['ngResource', 'ngSanitize'])
endpoints: function() {
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 = {
id: ID,
Name: name,
- URL: "tcp://" + URL,
+ URL: type === 'local' ? ("unix://" + URL) : ("tcp://" + URL),
TLS: TLS
};
var deferred = $q.defer();

0 comments on commit cd26051

Please sign in to comment.