branch develop updated (3886a2d -> 4807b51)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 3886a2d Livrable #8263 Merge branch 'feature/8263' into develop new efe729c Ne pas tenter de supprimer des lots déjà supprimés (See #8261) new 4807b51 Livrable #8261 Merge branch 'feature/8261' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 4807b5172e8d1a2d9a2c42ad497ab13c1abc42d4 Merge: 3886a2d efe729c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 07:48:41 2016 +0200 Livrable #8261 Merge branch 'feature/8261' into develop commit efe729c272e3af40b3ca53f0e86d22afcee2534e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 07:48:39 2016 +0200 Ne pas tenter de supprimer des lots déjà supprimés (See #8261) Summary of changes: .../catches/species/edit/actions/RemoveSpeciesBatchAction.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit efe729c272e3af40b3ca53f0e86d22afcee2534e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 07:48:39 2016 +0200 Ne pas tenter de supprimer des lots déjà supprimés (See #8261) --- .../catches/species/edit/actions/RemoveSpeciesBatchAction.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/RemoveSpeciesBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/RemoveSpeciesBatchAction.java index 1ede3c8..d53a6da 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/RemoveSpeciesBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/RemoveSpeciesBatchAction.java @@ -39,7 +39,6 @@ import org.jdesktop.swingx.JXTable; import javax.swing.JOptionPane; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.Set; import static org.nuiton.i18n.I18n.t; @@ -111,8 +110,6 @@ public class RemoveSpeciesBatchAction extends LongActionSupport<SpeciesBatchUIMo rowToRemove = new HashSet<>(); - Set<Integer> removedBatchId = new LinkedHashSet<>(); - for (int rowIndex : selectedRowIndexes) { SpeciesBatchRowModel selectedBatch = tableModel.getEntry(rowIndex); @@ -121,7 +118,7 @@ public class RemoveSpeciesBatchAction extends LongActionSupport<SpeciesBatchUIMo Integer selectedBatchId = selectedBatch.getIdAsInt(); boolean batchRoot = selectedBatch.isBatchRoot(); - if (!batchRoot && removedBatchId.contains(selectedBatch.getParentBatch().getIdAsInt())) { + if (!batchRoot && rowToRemove.contains(selectedBatch)) { // This batch was already removed if (log.isInfoEnabled()) { @@ -133,11 +130,8 @@ public class RemoveSpeciesBatchAction extends LongActionSupport<SpeciesBatchUIMo if (log.isInfoEnabled()) { log.info("Delete species batch: " + selectedBatchId); } - removedBatchId.add(selectedBatchId); // remove selected batch and all his children - - // remove parent batch (will destroy all his childs from db) persistenceService.deleteSpeciesBatch(selectedBatchId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm