[JENKINS-18280] Updated gui with checkbox

jenkinsci · Aug 6, 2013 · 9160fb0 · 9160fb0
1 parent 846471e
commit 9160fb0
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/src/main/java/net/praqma/hudson/scm/CCUCMScm.java b/src/main/java/net/praqma/hudson/scm/CCUCMScm.java
@@ -79,6 +79,11 @@ public class CCUCMScm extends SCM {
 
 	private boolean forceDeliver;
 
+    /**
+     * Determines whether to remove the view private files or not
+     */
+    private boolean removeViewPrivateFiles;
+
 	/* Old notifier fields */
 	private boolean recommend;
 	private boolean makeTag;
@@ -105,7 +110,7 @@ public CCUCMScm() {
 
 	@DataBoundConstructor
 	public CCUCMScm( String component, String levelToPoll, String loadModule, boolean newest, String polling, String stream, String treatUnstable, 
-			         boolean createBaseline, String nameTemplate, boolean forceDeliver, boolean recommend, boolean makeTag, boolean setDescription, String buildProject ) {
+			         boolean createBaseline, String nameTemplate, boolean forceDeliver, boolean removeViewPrivateFiles, boolean recommend, boolean makeTag, boolean setDescription, String buildProject ) {
 
 		this.component = component;
 		this.loadModule = loadModule;
@@ -119,6 +124,8 @@ public CCUCMScm( String component, String levelToPoll, String loadModule, boolea
 		this.nameTemplate = nameTemplate;
 
 		this.forceDeliver = forceDeliver;
+        this.removeViewPrivateFiles = removeViewPrivateFiles;
+
 		this.recommend = recommend;
 		this.makeTag = makeTag;
 		this.setDescription = setDescription;
@@ -888,7 +895,11 @@ public boolean getForceDeliver() {
 		return forceDeliver;
 	}
 
-	public boolean isCreateBaseline() {
+    public boolean isRemoveViewPrivateFiles() {
+        return removeViewPrivateFiles;
+    }
+
+    public boolean isCreateBaseline() {
 		return this.createBaseline;
 	}
 
@@ -1040,5 +1051,18 @@ public List<String> getLoadModules() {
 			loadModules.add( "Modifiable" );
 			return loadModules;
 		}
+
+        public FormValidation doCheckMode( @QueryParameter String mode, @QueryParameter String checked ) throws IOException {
+            boolean isChecked = checked.equalsIgnoreCase( "true" );
+            if( isChecked ) {
+                if( mode.equals( "self" ) ) {
+                    return FormValidation.warning( "You cannot create a baseline in self mode!" );
+                } else {
+                    return FormValidation.ok();
+                }
+            } else {
+                return FormValidation.ok();
+            }
+        }
 	}
 }
diff --git a/src/main/resources/net/praqma/hudson/scm/CCUCMScm/config.jelly b/src/main/resources/net/praqma/hudson/scm/CCUCMScm/config.jelly
@@ -39,7 +39,7 @@
 	<!-- unstable -->
 
     <f:entry title="Create baseline" help="/plugin/clearcase-ucm-plugin/scm/help-createBaseline.html">
-        <f:checkbox name="CCUCM.createBaseline" checked="${scm.createBaseline}" />
+        <f:checkbox name="CCUCM.createBaseline" checked="${scm.createBaseline}" checkUrl="'${rootURL}/scm/CCUCMScm/checkMode?checked='+(this.checked)+'&amp;mode='+encodeURIComponent(Form.findMatchingInput(this,'CCUCM.polling').value)" />
     </f:entry>
 
     <f:entry title="Name template" help="/plugin/clearcase-ucm-plugin/scm/help-template.html" field="template">
@@ -73,6 +73,10 @@
 		    <f:entry title="Force deliver" help="/plugin/clearcase-ucm-plugin/scm/help-forceDeliver.html">
 		        <f:checkbox name="CCUCM.forceDeliver" checked="${scm.forceDeliver}" />
 		    </f:entry>
+
+            <f:entry title="Remove view private files" help="/plugin/clearcase-ucm-plugin/scm/help-removeViewPrivateFiles.html">
+                <f:checkbox name="CCUCM.removeViewPrivateFiles" checked="${scm.removeViewPrivateFiles}" default="true"/>
+            </f:entry>
 
 		    <f:entry title="Build project" help="/plugin/clearcase-ucm-plugin/scm/help-buildProject.html">
 	      		<f:textbox name="buildProject" value="${scm.buildProject}"/>

diff --git a/src/main/webapp/scm/help-removeViewPrivateFiles.html b/src/main/webapp/scm/help-removeViewPrivateFiles.html
@@ -0,0 +1,3 @@
+<div>
+When checked the view private files of the ClearCase UCM view are removed.
+</div>