"Team Workflow" - ZBDFN - "TaskEditor delays during task selection when >3000 tasks loaded"

"Team Workflow" - RZ5QV - "Add automated commit-blocking reviews for "Validate Req Changes" and "Run Check Signals""

1 files changed, 12 insertions, 1 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java
index fd8a7f29c2f..7f568d21baa 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java
@@ -23,8 +23,10 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.osee.ats.AtsPlugin;

 import org.eclipse.osee.ats.artifact.ATSAttributes;

 import org.eclipse.osee.ats.artifact.ATSBranchMetrics;

+import org.eclipse.osee.ats.artifact.ReviewSMArtifact;

 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;

 import org.eclipse.osee.ats.artifact.VersionArtifact;

+import org.eclipse.osee.ats.artifact.ReviewSMArtifact.ReviewBlockType;

 import org.eclipse.osee.ats.editor.IAtsStateItem;

 import org.eclipse.osee.ats.editor.SMAManager;

 import org.eclipse.osee.framework.jdk.core.type.Pair;

@@ -234,7 +236,7 @@ public class AtsBranchManager {
     * Return working branch associated with SMA; This data is cached across all workflows with the cache being updated

     * by local and remote events.

     * 

-    * @return

+    * @return Branch

     * @throws SQLException

     */

    public Branch getWorkingBranch() throws OseeCoreException {

@@ -459,6 +461,15 @@ public class AtsBranchManager {
          }

       }

 

+      // Confirm that all blocking reviews are completed

+      // Loop through this state's blocking reviews to confirm complete

+      for (ReviewSMArtifact reviewArt : smaMgr.getReviewManager().getReviewsFromCurrentState()) {

+         if (reviewArt.getReviewBlockType() == ReviewBlockType.Commit && !reviewArt.getSmaMgr().isCancelledOrCompleted()) {

+            return new Result(

+                  "Blocking Review must be completed before commit.\n\nReview Title: \"" + reviewArt.getDescriptiveName() + "\"\nHRID: " + reviewArt.getHumanReadableId());

+         }

+      }

+

       if (!overrideStateValidation) {

          // Check extenstion points for valid commit

          for (IAtsStateItem item : smaMgr.getStateItems().getStateItems(smaMgr.getWorkPageDefinition().getId())) {