From 7397aaa43012f3c5176a40478a8f5fa455c61019 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Sat, 22 Jul 2023 13:59:36 +0200
Subject: [PATCH] fix adding role without template

when no template is selected the templatename field should be empty as
well in the newly added line
---
 .../RoleStrategyConfig/manage-project-roles.jelly             | 4 ++--
 src/main/webapp/js/tableManage.js                             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-project-roles.jelly b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-project-roles.jelly
index b370f4b2..4dc44ee5 100644
--- a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-project-roles.jelly
+++ b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-project-roles.jelly
@@ -57,7 +57,7 @@
 
   <template id="newItemRoleTemplate">
     <tr class="permission-row highlight-row">
-      <local:roleRow title="{{ROLE}}" global="${false}" pattern="{{PATTERN}}" type="${it.strategy.PROJECT}" templateName="{{TEMPLATENAME}}"
+      <local:roleRow title="{{ROLE}}" global="${false}" pattern="{{PATTERN}}" type="${it.strategy.PROJECT}" templateName=""
                      showRoleName="${true}" showPattern="${true}" showTemplate="${true}"
       />
     </tr>
@@ -73,7 +73,7 @@
     </f:entry>
     <f:entry>
       <rs:dropdownList title="Permission Template" name="template" id="${tableid}template">
-        <f:dropdownListBlock title="None" selected="true" value="__none__">
+        <f:dropdownListBlock title="None" selected="true" value="">
         </f:dropdownListBlock>
         <j:forEach var="permissionTemplate" items="${it.strategy.getPermissionTemplates()}">
           <f:dropdownListBlock title="${permissionTemplate.getName()}" selected="false" value="${permissionTemplate.getName()}">
diff --git a/src/main/webapp/js/tableManage.js b/src/main/webapp/js/tableManage.js
index c04fabd8..7c022ec4 100644
--- a/src/main/webapp/js/tableManage.js
+++ b/src/main/webapp/js/tableManage.js
@@ -222,7 +222,7 @@ addButtonAction = function(e, templateId, table, tableHighlighter, tableId) {
     if (tableId === "projectRoles") {
       let templateSelect = document.getElementById(tableId + 'template');
       let templateName = templateSelect.value;
-      if (templateName !== '__none__') {
+      if (templateName !== '') {
         template = window[templateId + "-" + templateName].content.firstElementChild.cloneNode(true);
       }
     }