fix adding role without template

when no template is selected the templatename field should be empty as well in the newly added line
jenkinsci · Jul 22, 2023 · 7397aaa · 7397aaa
1 parent 31d51ec
commit 7397aaa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...om/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-project-roles.jelly b/...om/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
@@ -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);
       }
     }