diff --git a/changelog.html b/changelog.html
index 4620974138..b8ad7e6a44 100644
--- a/changelog.html
+++ b/changelog.html
@@ -61,6 +61,9 @@ Upcoming changes
Allow filtering of the Run parameter build list by result.
(issue 7280)
+
+ When copying a folder, the display names of contained jobs were gratuitously cleared.
+ (issue 18074)
“Recurse in subfolders” option for list views produced exceptions when used with native Maven projects.
(issue 18025)
diff --git a/core/src/main/java/hudson/model/DisplayNameListener.java b/core/src/main/java/hudson/model/DisplayNameListener.java
index 93ddbdea05..8a41ccf4a8 100644
--- a/core/src/main/java/hudson/model/DisplayNameListener.java
+++ b/core/src/main/java/hudson/model/DisplayNameListener.java
@@ -50,7 +50,7 @@ public class DisplayNameListener extends ItemListener {
*/
public void onCopied(Item src, Item item) {
// bug 5056825 - Display name field should be cleared when you copy a job.
- if(item instanceof AbstractItem) {
+ if(item instanceof AbstractItem && src.getParent() == item.getParent()) {
AbstractItem dest = (AbstractItem)item;
try {
dest.setDisplayName(null);
diff --git a/test/src/main/java/org/jvnet/hudson/test/MockFolder.java b/test/src/main/java/org/jvnet/hudson/test/MockFolder.java
index 50d5d17057..628cf92325 100644
--- a/test/src/main/java/org/jvnet/hudson/test/MockFolder.java
+++ b/test/src/main/java/org/jvnet/hudson/test/MockFolder.java
@@ -136,6 +136,17 @@ public class MockFolder extends AbstractItem implements ModifiableTopLevelItemGr
return mixin().copy(src, name);
}
+ @Override public void onCopiedFrom(Item src) {
+ super.onCopiedFrom(src);
+ for (TopLevelItem item : ((MockFolder) src).getItems()) {
+ try {
+ copy(item, item.getName());
+ } catch (IOException x) {
+ assert false : x;
+ }
+ }
+ }
+
@Override public TopLevelItem createProjectFromXML(String name, InputStream xml) throws IOException {
return mixin().createProjectFromXML(name, xml);
}
diff --git a/test/src/test/java/hudson/model/DisplayNameTest.java b/test/src/test/java/hudson/model/DisplayNameTest.java
index afe508e1ac..38fd8a0610 100644
--- a/test/src/test/java/hudson/model/DisplayNameTest.java
+++ b/test/src/test/java/hudson/model/DisplayNameTest.java
@@ -28,7 +28,9 @@ import jenkins.model.Jenkins;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
+import org.jvnet.hudson.test.Bug;
import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.MockFolder;
/**
* @author kingfai
@@ -90,4 +92,16 @@ public class DisplayNameTest {
Assert.assertEquals(newProjectName, newProject.getDisplayName());
}
+
+ @Bug(18074)
+ @Test public void copyJobWithDisplayNameToDifferentFolder() throws Exception {
+ MockFolder d1 = j.createFolder("d1");
+ FreeStyleProject job = d1.createProject(FreeStyleProject.class, "job");
+ job.setDisplayName("My Job");
+ MockFolder d2 = j.jenkins.copy(d1, "d2");
+ FreeStyleProject j2 = (FreeStyleProject) d2.getItem("job");
+ Assert.assertNotNull(j2);
+ Assert.assertEquals("My Job", j2.getDisplayName());
+ }
+
}