Merge pull request #14 from KostyaSha/JENKINS-26118

Use optionalBlock instead checkbox.
jenkinsci · Jan 8, 2015 · 5c2fa0c · 5c2fa0c
2 parents 6657015 + 0cbb5b7
commit 5c2fa0c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/com/chikli/hudson/plugin/naginator/NaginatorOptOutProperty.java b/src/main/java/com/chikli/hudson/plugin/naginator/NaginatorOptOutProperty.java
@@ -19,12 +19,17 @@ public boolean isOptOut() {
         return optOut;
     }
 
+    @Override
+    public DescriptorImpl getDescriptor() {
+        return (DescriptorImpl) super.getDescriptor();
+    }
+
     @Extension
     public static class DescriptorImpl extends JobPropertyDescriptor {
 
         @Override
         public String getDisplayName() {
-            return "";
+            return "Naginator Property";
         }
     }
 }
diff --git a/src/main/resources/com/chikli/hudson/plugin/naginator/NaginatorOptOutProperty/config.jelly b/src/main/resources/com/chikli/hudson/plugin/naginator/NaginatorOptOutProperty/config.jelly
@@ -1,6 +1,9 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-    <f:entry field="optOut">
-        <f:checkbox title="Don't let user manually re-trigger this job"/>
-    </f:entry>
-
+<f:optionalBlock name="optOut"
+                 title="Don't let user manually re-trigger this job"
+                 checked="${instance.optOut}"
+                 inline="true"
+                 help="plugin/naginator/help-optOut.html"
+        />
 </j:jelly>