diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationTimeSeriesController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationTimeSeriesController.java index a5f60bd0a252a8ef438784e4fee20739e91140eb..12d231bb51d624fcade794b06cf0b34a91a14cda 100644 --- a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationTimeSeriesController.java +++ b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationTimeSeriesController.java @@ -193,8 +193,21 @@ public class ObservationTimeSeriesController extends HttpServlet { response.sendError(500, ExceptionUtil.getStackTrace(e)); } } else if (action.equals("deleteObservationTimeSeries")) { - Integer observationTimeSeriesId = Integer.valueOf(request.getParameter("observationTimeSeriesId")); - LOGGER.info("Delete observationTimeSeries {}", observationTimeSeriesId); + try { + Integer observationTimeSeriesId = Integer.valueOf(request.getParameter("observationTimeSeriesId")); + LOGGER.info("Delete observationTimeSeries {}", observationTimeSeriesId); + observationTimeSeriesBean.deleteObservationTimeSeries(observationTimeSeriesId); + + // Redirect to list + response.sendRedirect(new StringBuilder(Globals.PROTOCOL + "://") + .append(ServletUtil.getServerName(request)) + .append("/observationTimeSeries") + .append("?messageKey=").append("observationTimeSeriesDeleted").toString() + ); + } catch (NullPointerException | NumberFormatException ex) { + response.sendError(500, ExceptionUtil.getStackTrace(ex)); + } + } } } diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties index 28c36c9d26d93a4b2e843bb3884c1050cce53ca5..8726f493b3cabd9abb2c749ecf04ec1309845a07 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties @@ -1097,3 +1097,4 @@ addNewObservationInTimeSeries=Add observation to time series observationTimeSeriesName=Name observationTimeSeriesDescription=Description year=Year +observationTimeSeriesDeleted = Observation time series was deleted diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties index a5b139b2f4b63363421e2e6a3d292489634957fa..cbfd5821c9669b4d88e4d986430a0cf3fac31013 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties @@ -1096,3 +1096,4 @@ addNewObservationInTimeSeries=Legg til ny observasjon i tidsserien observationTimeSeriesName=Navn observationTimeSeriesDescription=Beskrivelse year=\u00c5r +observationTimeSeriesDeleted = Tidsserie slettet diff --git a/src/main/webapp/templates/observationTimeSeriesForm.ftl b/src/main/webapp/templates/observationTimeSeriesForm.ftl index 06047181e2dc5699db4d3a0cdf5234727a1d2d7b..9d5794bc184041463d51437d53477851082f662b 100644 --- a/src/main/webapp/templates/observationTimeSeriesForm.ftl +++ b/src/main/webapp/templates/observationTimeSeriesForm.ftl @@ -525,7 +525,7 @@ <span class="help-block" id="${formId}_description_validation"></span> </div> <button type="submit" class="btn btn-default">${i18nBundle.submit}</button> - <#if observationTimeSeries.observationTimeSeriesId?has_content> + <#if observationTimeSeries.observationTimeSeriesId?has_content && isEditable> <button type="button" class="btn btn-danger" onclick="if(confirm('${i18nBundle.confirmDelete}')){window.location.href='/observationTimeSeries?action=deleteObservationTimeSeries&observationTimeSeriesId=${observationTimeSeries.observationTimeSeriesId}';}">${i18nBundle.delete}</button> </#if>