From 71a733503d80452f61dc340f3c6ab01ab636c29e Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 23 Jul 2022 18:58:24 +0200
Subject: [PATCH] #677 - only check for keywords if transactions is marked as
expenditure
---
.../src/main/resources/static/js/transactions.js | 3 ++-
.../transactions/transactionNameKeywordWarningModal.ftl | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/BudgetMasterServer/src/main/resources/static/js/transactions.js b/BudgetMasterServer/src/main/resources/static/js/transactions.js
index 9a09d15f9..cfdcc2c4e 100644
--- a/BudgetMasterServer/src/main/resources/static/js/transactions.js
+++ b/BudgetMasterServer/src/main/resources/static/js/transactions.js
@@ -385,7 +385,8 @@ function convertDateWithoutDots(dateString)
function validateForm(isSaveAndContinue = false, allowEmptyAmount = false, skipKeywordCheck = false)
{
// name (keyword check)
- if(!skipKeywordCheck)
+ let isExpenditure = document.getElementById('input-isPayment').value === "1";
+ if(!skipKeywordCheck && isExpenditure)
{
let nameContainsKeywords = checkNameForKeywords(isSaveAndContinue);
if(nameContainsKeywords)
diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/transactionNameKeywordWarningModal.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/transactionNameKeywordWarningModal.ftl
index 06d14e0c0..173e58c62 100644
--- a/BudgetMasterServer/src/main/resources/templates/transactions/transactionNameKeywordWarningModal.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/transactions/transactionNameKeywordWarningModal.ftl
@@ -16,13 +16,13 @@
<div class="row">
<div class="col s12">
- <@header.buttonLink url='/settings' icon='rule_folder' localizationKey='transaction.warning.name.keyword.button.edit' color='background-blue' id='buttonChangeTransactionType' classes='text-white' target='_blank'/>
+ <@header.buttonLink url='/settings' icon='rule_folder' localizationKey='transaction.warning.name.keyword.button.edit' color='background-blue' classes='text-white' target='_blank'/>
</div>
</div>
</div>
<div class="modal-footer background-color">
<@header.buttonLink id='keyword-warning-button-ignore' url='' icon='save' localizationKey='transaction.warning.name.keyword.button.ignore' color='red' classes='text-white' noUrl=true/>
- <@header.buttonLink url='' icon='edit' localizationKey='transaction.warning.name.keyword.button.cancel' color='green' id='buttonChangeTransactionType' classes='modal-action modal-close text-white' noUrl=true/>
+ <@header.buttonLink id='keyword-warning-button-cancel' url='' icon='edit' localizationKey='transaction.warning.name.keyword.button.cancel' color='green' classes='modal-action modal-close text-white' noUrl=true/>
</div>
</div>
--
GitLab