Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormegumi.telles2014-06-10 17:19:30 +0000
committerRoberto E. Escobar2014-08-28 23:58:31 +0000
commitce7d49e399ac53c7eef4295ff3ce5c0a3f51b667 (patch)
tree8a49daca16b74520e409d5be9f668fdf5ee04221
parent2cba21dbf75f6e7bed63a267036ddd7192eb4b77 (diff)
downloadorg.eclipse.osee-ce7d49e399ac53c7eef4295ff3ce5c0a3f51b667.tar.gz
org.eclipse.osee-ce7d49e399ac53c7eef4295ff3ce5c0a3f51b667.tar.xz
org.eclipse.osee-ce7d49e399ac53c7eef4295ff3ce5c0a3f51b667.zip
bug[ats_H0RCH]: Fix reverted artifacts detection of edit-on-other-branch
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java2
1 files changed, 1 insertions, 1 deletions
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 50558bc9b2..8cbb15e8c9 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?";

Back to the top