bug: Fix AtsXCommitManagerValidator to check if commit is necessary

1 files changed, 8 insertions, 6 deletions

diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/validator/AtsXCommitManagerValidator.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/validator/AtsXCommitManagerValidator.java
index e907cc1f0d1..987fcb82324 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/validator/AtsXCommitManagerValidator.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/validator/AtsXCommitManagerValidator.java
@@ -31,12 +31,14 @@ public class AtsXCommitManagerValidator extends AtsXWidgetValidator {
          try {
             if (provider instanceof ArtifactValueProvider && ((ArtifactValueProvider) provider).getArtifact() instanceof TeamWorkFlowArtifact) {
                TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) ((ArtifactValueProvider) provider).getArtifact();
-               if (!AtsBranchManagerCore.isAllObjectsToCommitToConfigured(teamArt)) {
-                  return new WidgetResult(WidgetStatus.Invalid_Incompleted, widgetDef,
-                     "All branches must be configured and committed.");
-               } else if (!AtsBranchManagerCore.isBranchesAllCommitted(teamArt)) {
-                  return new WidgetResult(WidgetStatus.Invalid_Incompleted, widgetDef,
-                     "All branches must be committed.");
+               if (AtsBranchManagerCore.isWorkingBranchInWork(teamArt) || AtsBranchManagerCore.isCommittedBranchExists(teamArt)) {
+                  if (!AtsBranchManagerCore.isAllObjectsToCommitToConfigured(teamArt)) {
+                     return new WidgetResult(WidgetStatus.Invalid_Incompleted, widgetDef,
+                        "All branches must be configured and committed.");
+                  } else if (!AtsBranchManagerCore.isBranchesAllCommitted(teamArt)) {
+                     return new WidgetResult(WidgetStatus.Invalid_Incompleted, widgetDef,
+                        "All branches must be committed.");
+                  }
                }
             }
          } catch (OseeCoreException ex) {