jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "Fix duplicated actions field in XML for folders"

This commit is contained in:
Zuul 2018-02-27 18:08:33 +00:00 committed by Gerrit Code Review
parent eb1544eb60 ca5d12627f
commit 30d97916fa
3 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jenkins_jobs/modules/project_folder.py
View File

@ -44,7 +44,6 @@ class Folder(jenkins_jobs.modules.base.Base):
def root_xml(self, data):
xml_parent = XML.Element('com.cloudbees.hudson.plugins.folder.Folder',
plugin="cloudbees-folder")
XML.SubElement(xml_parent, 'actions')
attributes = {"class": "com.cloudbees.hudson.plugins.folder."
"icons.StockFolderIcon"}
XML.SubElement(xml_parent, 'icon', attrib=attributes)

1
tests/yamlparser/fixtures/project_folder_template001.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder">
<actions/>
<icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
<views/>
<viewsTabBar class="hudson.views.DefaultViewsTabBar"/>

1
tests/yamlparser/fixtures/project_folder_template002.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder">
<actions/>
<icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
<views/>
<viewsTabBar class="hudson.views.DefaultViewsTabBar"/>