From e8e1c664b05ccd62fc31025b82f57cf729897eb5 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Tue, 1 May 2018 17:25:46 +0200
Subject: [PATCH] disabled editing of payments associated with category "REST";
removed category "REST" from newPayment category select
---
.../java/de/deadlocker8/budgetmaster/entities/CategoryType.java | 2 +-
src/main/resources/templates/payments/newPayment.ftl | 2 +-
src/main/resources/templates/payments/payments.ftl | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/entities/CategoryType.java b/src/main/java/de/deadlocker8/budgetmaster/entities/CategoryType.java
index 9547a33ea..f8a89f210 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/entities/CategoryType.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/entities/CategoryType.java
@@ -3,5 +3,5 @@ package de.deadlocker8.budgetmaster.entities;
public enum CategoryType
{
- NONE, REST, CUSTOM;
+ NONE, REST, CUSTOM
}
diff --git a/src/main/resources/templates/payments/newPayment.ftl b/src/main/resources/templates/payments/newPayment.ftl
index d6910552e..c1f2535e1 100644
--- a/src/main/resources/templates/payments/newPayment.ftl
+++ b/src/main/resources/templates/payments/newPayment.ftl
@@ -62,7 +62,7 @@
<#else>
<#if category.getType() == "NONE">
<option selected value="${category.getID()}">${category.getName()}</option>
- <#else>
+ <#elseif category.getType() != "REST">
<option value="${category.getID()}">${category.getName()}</option>
</#if>
</#if>
diff --git a/src/main/resources/templates/payments/payments.ftl b/src/main/resources/templates/payments/payments.ftl
index a7a721cfe..e0df3f080 100644
--- a/src/main/resources/templates/payments/payments.ftl
+++ b/src/main/resources/templates/payments/payments.ftl
@@ -45,8 +45,8 @@
<td class="bold text-dark-green">${helpers.getCurrencyString(payment.amount)}</td>
</#if>
<td>
- <a href="/payments/${payment.ID}/edit" class="btn-flat no-padding"><i class="material-icons left">edit</i></a>
<#if (payment.category.type.name() != "REST")>
+ <a href="/payments/${payment.ID}/edit" class="btn-flat no-padding"><i class="material-icons left">edit</i></a>
<a href="/payments/${payment.ID}/requestDelete" class="btn-flat no-padding"><i class="material-icons left">delete</i></a>
</#if>
</td>
--
GitLab