From e3ecede0b12dbeb3111b1a30f786ab9f7de923ca Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 10 Jul 2017 09:59:19 -0700
Subject: [PATCH] Bugfix: Allowing existing names on existing pois
---
.../logic/controller/servlet/PointOfInterestController.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
index e0c9a16c..ed8ad797 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
@@ -595,7 +595,8 @@ public class PointOfInterestController extends HttpServlet {
{
FormValidation formValidation = FormValidator.validateForm("poiForm", request, getServletContext());
Boolean poiNameAlreadyExists = SessionControllerGetter.getPointOfInterestBean().getPointOfInterest(formValidation.getFormField("name").getWebValue()) != null;
- if(formValidation.isValid() && ! poiNameAlreadyExists)
+ // Only store if valid form data and NOT a new poi with an existing poiName
+ if(formValidation.isValid() && !(poi.getPointOfInterestId() == null && poiNameAlreadyExists))
{
// Set values
poi.setName(formValidation.getFormField("name").getWebValue());
--
GitLab