Merge pull request #47 from Brantone/master

Support 'Ownership' plugin. closes #43
JoelJ · Jun 21, 2015 · 4fd1585 · 4fd1585
2 parents 97610a0 + 66c1dc6
commit 4fd1585
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/src/main/java/com/joelj/jenkins/eztemplates/TemplateImplementationProperty.java b/src/main/java/com/joelj/jenkins/eztemplates/TemplateImplementationProperty.java
@@ -26,16 +26,18 @@ public class TemplateImplementationProperty extends JobProperty<AbstractProject<
     private final boolean syncDisabled;
     private final boolean syncSecurity;
     private final boolean syncScm;
+    private final boolean syncOwnership;
 
     @DataBoundConstructor
-    public TemplateImplementationProperty(String templateJobName, boolean syncMatrixAxis, boolean syncDescription, boolean syncBuildTriggers, boolean syncDisabled, boolean syncSecurity, boolean syncScm) {
+    public TemplateImplementationProperty(String templateJobName, boolean syncMatrixAxis, boolean syncDescription, boolean syncBuildTriggers, boolean syncDisabled, boolean syncSecurity, boolean syncScm, boolean syncOwnership) {
         this.templateJobName = templateJobName;
         this.syncMatrixAxis = syncMatrixAxis;
         this.syncDescription = syncDescription;
         this.syncBuildTriggers = syncBuildTriggers;
         this.syncDisabled = syncDisabled;
         this.syncSecurity = syncSecurity;
         this.syncScm = syncScm;
+        this.syncOwnership = syncOwnership;
     }
 
     @Exported
@@ -72,6 +74,10 @@ public boolean getSyncScm() {
         return syncScm;
     }
 
+    public boolean getSyncOwnership() {
+        return syncOwnership;
+    }
+
     public AbstractProject findTemplate() {
         return ProjectUtils.findProject(getTemplateJobName());
     }
@@ -90,8 +96,9 @@ public JobProperty<?> newInstance(StaplerRequest request, JSONObject formData) t
                 boolean syncDisabled = useTemplate.getBoolean("syncDisabled");
                 boolean syncSecurity = useTemplate.getBoolean("syncSecurity");
                 boolean syncScm = useTemplate.getBoolean("syncScm");
+                boolean syncOwnership = useTemplate.getBoolean("syncOwnership");
 
-                return new TemplateImplementationProperty(templateJobName, syncMatrixAxis, syncDescription, syncBuildTriggers, syncDisabled, syncSecurity, syncScm);
+                return new TemplateImplementationProperty(templateJobName, syncMatrixAxis, syncDescription, syncBuildTriggers, syncDisabled, syncSecurity, syncScm, syncOwnership);
             }
 
             return null;

diff --git a/src/main/java/com/joelj/jenkins/eztemplates/utils/TemplateUtils.java b/src/main/java/com/joelj/jenkins/eztemplates/utils/TemplateUtils.java
@@ -68,7 +68,8 @@ public static void handleTemplateCopied(AbstractProject copy, AbstractProject or
                 false,
                 false,
                 false,
-                true
+                false,
+                false
         );
         copy.addProperty(implProperty);
     }
@@ -99,6 +100,7 @@ public static void handleTemplateImplementationSaved(AbstractProject implementat
         String description = implementationProject.getDescription();
         AuthorizationMatrixProperty oldAuthMatrixProperty = (AuthorizationMatrixProperty) implementationProject.getProperty(AuthorizationMatrixProperty.class);
         SCM oldScm = (SCM) implementationProject.getScm();
+        JobProperty oldOwnership = implementationProject.getProperty("com.synopsys.arc.jenkins.plugins.ownership.jobs.JobOwnerJobProperty");
 
         AxisList oldAxisList = null;
         if (implementationProject instanceof MatrixProject && !property.getSyncMatrixAxis()) {
@@ -139,6 +141,11 @@ public static void handleTemplateImplementationSaved(AbstractProject implementat
             implementationProject.setScm(oldScm);
         }
 
+        if (!property.getSyncOwnership() && oldOwnership != null) {
+            implementationProject.removeProperty(oldOwnership.getClass());
+            implementationProject.addProperty(oldOwnership);
+        }
+
         ProjectUtils.silentSave(implementationProject);
     }
 

diff --git a/src/main/resources/com/joelj/jenkins/eztemplates/TemplateImplementationProperty/config.jelly b/src/main/resources/com/joelj/jenkins/eztemplates/TemplateImplementationProperty/config.jelly
@@ -31,8 +31,11 @@
 				<f:checkbox />
 			</f:entry>
 			<f:entry field="syncScm" title="${%Sync Source Control Mgmt}">
-				<f:checkbox default="true" />
+				<f:checkbox />
+			</f:entry>
+			<f:entry field="syncOwnership" title="${%Sync Ownership}">
+				<f:checkbox />
 			</f:entry>
                 </f:advanced>
 	</f:optionalBlock>
-</j:jelly>
+</j:jelly>