From ce7d49e399ac53c7eef4295ff3ce5c0a3f51b667 Mon Sep 17 00:00:00 2001
From: megumi.telles
Date: Tue, 10 Jun 2014 10:19:30 -0700
Subject: bug[ats_H0RCH]: Fix reverted artifacts detection of
 edit-on-other-branch

Change-Id: I38b7aa63b83f5ef407c53ecdcce142964fe32ccc
---
 .../src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java
index 50558bc9b21..8cbb15e8c91 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java
@@ -35,7 +35,7 @@ public final class ArtifactGuis {
    }
 
    private static final String OTHER_EDIT_SQL =
-      "select br.branch_id, att.gamma_id, att.attr_id from osee_attribute att, osee_txs txs, osee_branch br where att.art_id = ? and att.gamma_id = txs.gamma_id and txs.branch_id = br.branch_id and txs.transaction_id <> br.baseline_transaction_id and br.branch_id <> ? and br.parent_branch_id = ? and br.branch_type = ?";
+      "select br.branch_id, att.gamma_id, att.attr_id, txs.tx_current, txs.transaction_id from osee_attribute att, osee_txs txs, osee_branch br where att.art_id = ? and att.gamma_id = txs.gamma_id and txs.branch_id = br.branch_id and txs.transaction_id <> br.baseline_transaction_id and txs.tx_current = 1 and  br.branch_id <> ? and br.parent_branch_id = ? and br.branch_type = ?  AND NOT EXISTS (SELECT 1 FROM osee_txs txs1 WHERE txs1.branch_id = br.branch_id AND txs1.transaction_id = br.baseline_transaction_id AND txs1.gamma_id = txs.gamma_id)";
 
    private static final String EDIT_MESSAGE =
       "%d of the %d artifacts about to be edited have already been modified on the following branches:%s\n\nDo you still wish to proceed?";
-- 
cgit v1.2.3