From 4adedf943606e70167afac09d7f3e996733d2d23 Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Thu, 29 Jun 2017 08:37:05 +0200
Subject: [PATCH] fix(service-details): fix an issue where secret target would
 be overwritten (#964)

---
 app/components/createService/createServiceController.js | 4 +++-
 app/helpers/secretHelper.js                             | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/components/createService/createServiceController.js b/app/components/createService/createServiceController.js
index ca5b9f7dd..9a29f315d 100644
--- a/app/components/createService/createServiceController.js
+++ b/app/components/createService/createServiceController.js
@@ -222,7 +222,9 @@ function ($q, $scope, $state, Service, ServiceHelper, SecretHelper, SecretServic
       var secrets = [];
       angular.forEach(input.Secrets, function(secret) {
         if (secret.model) {
-          secrets.push(SecretHelper.secretConfig(secret.model));
+          var s = SecretHelper.secretConfig(secret.model);
+          s.File.Name = s.SecretName;
+          secrets.push(s);
         }
       });
       config.TaskTemplate.ContainerSpec.Secrets = secrets;
diff --git a/app/helpers/secretHelper.js b/app/helpers/secretHelper.js
index ff84aaef5..9c0f3d65b 100644
--- a/app/helpers/secretHelper.js
+++ b/app/helpers/secretHelper.js
@@ -21,7 +21,7 @@ angular.module('portainer.helpers')
           SecretID: secret.Id,
           SecretName: secret.Name,
           File: {
-            Name: secret.Name,
+            Name: secret.FileName,
             UID: '0',
             GID: '0',
             Mode: 444