From eaffde39f6bb9301188790dfe4a3ec90a0f51d58 Mon Sep 17 00:00:00 2001
From: Hao Zhang <hao.zhang@portainer.io>
Date: Sun, 27 Feb 2022 16:04:48 +0800
Subject: [PATCH] fix(stack): incorrect stack name (#6587)

---
 .../accessControlPanel/porAccessControlPanel.html     |  2 +-
 .../porAccessControlPanelController.js                | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/portainer/components/accessControlPanel/porAccessControlPanel.html b/app/portainer/components/accessControlPanel/porAccessControlPanel.html
index 5b7796bc1..47ab6613f 100644
--- a/app/portainer/components/accessControlPanel/porAccessControlPanel.html
+++ b/app/portainer/components/accessControlPanel/porAccessControlPanel.html
@@ -65,7 +65,7 @@
             <tr ng-if="$ctrl.resourceControl.Type === $ctrl.RCTI.STACK && $ctrl.resourceType !== $ctrl.RCTS.STACK">
               <td colspan="2">
                 <i class="fa fa-info-circle" aria-hidden="true" style="margin-right: 2px"></i>
-                Access control on this resource is inherited from the following stack: {{ $ctrl.resourceControl.ResourceId }}
+                Access control on this resource is inherited from the following stack: {{ $ctrl.removeEndpointId($ctrl.resourceControl.ResourceId) }}
                 <portainer-tooltip
                   message="Access control applied on a stack is also applied on each resource in the stack."
                   position="bottom"
diff --git a/app/portainer/components/accessControlPanel/porAccessControlPanelController.js b/app/portainer/components/accessControlPanel/porAccessControlPanelController.js
index ce846cb66..8578c7994 100644
--- a/app/portainer/components/accessControlPanel/porAccessControlPanelController.js
+++ b/app/portainer/components/accessControlPanel/porAccessControlPanelController.js
@@ -56,6 +56,17 @@ angular.module('portainer.app').controller('porAccessControlPanelController', [
       });
     };
 
+    ctrl.removeEndpointId = function (stackName) {
+      if (!stackName) {
+        return stackName;
+      }
+      const firstUnderlineIndex = stackName.indexOf('_');
+      if (firstUnderlineIndex < 0) {
+        return stackName;
+      }
+      return stackName.substring(firstUnderlineIndex + 1);
+    };
+
     function validateForm() {
       ctrl.state.formValidationError = '';
       var error = '';