Fix displaying progress for some tasks

(but more progress-displaying issues remain)
Evolveum · May 3, 2018 · eaeb3d4 · eaeb3d4
1 parent 4d01d1d
commit eaeb3d4
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
@@ -673,6 +673,10 @@ public boolean isCoordinator() {
 		return taskType.getWorkManagement() != null && taskType.getWorkManagement().getTaskKind() == TaskKindType.COORDINATOR;
 	}
 
+	public boolean isCoordinatedWorker() {
+		return taskType.getWorkManagement() != null && taskType.getWorkManagement().getTaskKind() == TaskKindType.WORKER;
+	}
+
 	public boolean hasBuckets() {
 		if (taskType.getWorkState() == null) {
 			return false;
@@ -690,14 +694,14 @@ public boolean hasBuckets() {
 		}
 	}
 
-	public boolean isBucketed() {
-		return isCoordinator() || hasBuckets();
+	public boolean isWorkStateHolder() {
+		return (isCoordinator() || hasBuckets()) && !isCoordinatedWorker();
 	}
 
 	private String getRealProgressDescription() {
 		if (isPartitionedMaster()) {
 			return getPartitionedTaskProgressDescription();
-		} else if (isBucketed()) {
+		} else if (isWorkStateHolder()) {
 			return getBucketedTaskProgressDescription();
 		} else {
 			return getPlainTaskProgressDescription();