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 5f05dbf8198c57e7f1149f36bc3c917c49b37697 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Fri Aug 5 10:56:39 2016 +0200 fixes #8048: [OBSERVATIONS INDIVIDUELLES] Navigation efficace pour accéder au trait précédent/suivant de la même espèce - remove double ask user to save data --- .../actions/SearchSpeciesInPrevOrNextCatchesAction.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SearchSpeciesInPrevOrNextCatchesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SearchSpeciesInPrevOrNextCatchesAction.java index bdc5111..561eddd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SearchSpeciesInPrevOrNextCatchesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SearchSpeciesInPrevOrNextCatchesAction.java @@ -108,8 +108,7 @@ public class SearchSpeciesInPrevOrNextCatchesAction extends SaveSupportAction { protected Map search() { Map result; - // FIXME poussin rechercher dans un trait precedent s'il y a la meme espece - // si oui faire l'action, sinon dire qu'on a rien trouve. + SpeciesFrequencyUIModel model = handler.getModel(); int fishingOperationId = model.getFishingOperation().getIdAsInt(); int taxonId = model.getBatch().getSpecies().getReferenceTaxonId(); @@ -135,6 +134,12 @@ public class SearchSpeciesInPrevOrNextCatchesAction extends SaveSupportAction { // Ask confirmation to quit screen doAction = handler.askCancelEditBeforeLeaving(); + if (doAction) { + // to prevent ask again user, when FishingOperation combobox change + // if combo had used vetoable and not propertyChange to check + // modification and cancel action, this method would not be necessary + handler.getModel().setModify(false); + } } return doAction; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.