[JENKINS-28462] Priority selection on Job is "always" shown

jenkinsci · May 18, 2015 · 972ffb5 · 972ffb5
1 parent 15b3a5d
commit 972ffb5
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/java/jenkins/advancedqueue/priority/strategy/PriorityJobProperty.java b/src/main/java/jenkins/advancedqueue/priority/strategy/PriorityJobProperty.java
@@ -31,9 +31,11 @@
 import hudson.model.JobPropertyDescriptor;
 import hudson.util.ListBoxModel;
 
+import java.util.List;
 import java.util.logging.Logger;
 
 import jenkins.advancedqueue.JobGroup;
+import jenkins.advancedqueue.JobGroup.PriorityStrategyHolder;
 import jenkins.advancedqueue.Messages;
 import jenkins.advancedqueue.PriorityConfiguration;
 import jenkins.advancedqueue.PriorityConfigurationCallback;
@@ -119,7 +121,15 @@ public ListBoxModel getPriorities() {
 		public boolean isUsed(Job<?,?> owner) {
 			PriorityConfiguration configuration = PriorityConfiguration.get();
 			JobGroup jobGroup = configuration.getJobGroup(dummyCallback, owner);
-			return jobGroup != null;
+			if(jobGroup != null && jobGroup.isUsePriorityStrategies()) {
+				List<PriorityStrategyHolder> priorityStrategies = jobGroup.getPriorityStrategies();
+				for (PriorityStrategyHolder priorityStrategyHolder : priorityStrategies) {
+					if(priorityStrategyHolder.getPriorityStrategy() instanceof JobPropertyStrategy) {
+						return true;
+					}
+				}
+			}
+			return false;
 		}
 	}
 }