This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 28bc3c4e3162ebd653ff510a7ca6870511e4671d Author: Adrien <a.garandel@dralagen.fr> Date: Mon Jul 21 10:59:47 2014 +0200 delete old resource when editing choice --- .../org/chorem/pollen/services/service/ChoiceService.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index 4eb39ad..d8dcf14 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java @@ -210,6 +210,19 @@ public class ChoiceService extends PollenServiceSupport { toSave = getChoice(poll, choice.getEntityId()); + if (toSave.getChoiceType() == ChoiceType.RESOURCE) { + // check if new resource then delete old resource + if (choice.getChoiceType() != ChoiceType.RESOURCE + || + ! toSave.getChoiceValue().equals( + getPollenResourceService().getTopiaIdByReduceId(choice.getChoiceValue()) + )) { + + // delete the old resource + getPollenResourceDao().delete(getPollenResourceService().getResource0(toSave.getChoiceValue())); + } + } + } else { // create a new choice -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.