"Team Workflow" - MLNLJ - "View related artifacts that are included in Change Reports for Working or Committed branches"

Add support for parent transaction id for branches

1 files changed, 2 insertions, 6 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 0b533d6a3cf..d741e7ac9db 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
@@ -366,7 +366,7 @@ public class AtsBranchManager {
     * @param parentBranch

     * @throws Exception

     */

-   public void createWorkingBranch(String pageId, Branch parentBranch) throws OseeCoreException {

+   public void createWorkingBranch(String pageId, final Branch parentBranch) throws OseeCoreException {

       final Artifact stateMachineArtifact = smaMgr.getSma();

       String title = stateMachineArtifact.getDescriptiveName();

       if (title.length() > 40) title = title.substring(0, 39) + "...";

@@ -381,14 +381,10 @@ public class AtsBranchManager {
          }

       }

       final String finalBranchShortName = branchShortName;

-      // TODO Move this into createWorkingBranch

-      final TransactionId parentTransactionId =

-            TransactionIdManager.getInstance().getEditableTransactionId(parentBranch);

 

       IExceptionableRunnable runnable = new IExceptionableRunnable() {

          public void run(IProgressMonitor monitor) throws OseeCoreException {

-            BranchManager.createWorkingBranch(parentTransactionId, finalBranchShortName, branchName,

-                  stateMachineArtifact);

+            BranchManager.createWorkingBranch(parentBranch, finalBranchShortName, branchName, stateMachineArtifact);

             // Create reviews as necessary

             SkynetTransaction transaction = new SkynetTransaction(AtsPlugin.getAtsBranch());

             createNecessaryBranchEventReviews(StateEventType.CreateBranch, smaMgr, transaction);