From a4e520b7609a7858b1954ce641ceb7c2b14aecd0 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sun, 9 May 2021 11:01:55 +0200 Subject: [PATCH] Fixed #609 - search results should show account icon instead of name --- src/main/resources/templates/search/search.ftl | 4 ++-- .../resources/templates/transactions/transactionsMacros.ftl | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/resources/templates/search/search.ftl b/src/main/resources/templates/search/search.ftl index 833b1a79a..37845577e 100644 --- a/src/main/resources/templates/search/search.ftl +++ b/src/main/resources/templates/search/search.ftl @@ -41,7 +41,7 @@ ${dateService.getDateStringNormal(transaction.date)} </div> <@transactionsMacros.transactionType transaction/> - <@transactionsMacros.transactionAccount transaction/> + <@transactionsMacros.transactionAccountIcon transaction/> <@transactionsMacros.transactionLinks transaction/> </div> <div class="row valign-wrapper no-margin-bottom"> @@ -57,7 +57,7 @@ </div> <@transactionsMacros.transactionCategory transaction "left-align"/> <@transactionsMacros.transactionType transaction/> - <@transactionsMacros.transactionAccount transaction/> + <@transactionsMacros.transactionAccountIcon transaction/> <@transactionsMacros.transactionNameAndDescription transaction "l3 xl4"/> <@transactionsMacros.transactionAmount transaction transaction.getAccount() "l2 xl2"/> <@transactionsMacros.transactionLinks transaction/> diff --git a/src/main/resources/templates/transactions/transactionsMacros.ftl b/src/main/resources/templates/transactions/transactionsMacros.ftl index e20efe147..29d553482 100644 --- a/src/main/resources/templates/transactions/transactionsMacros.ftl +++ b/src/main/resources/templates/transactions/transactionsMacros.ftl @@ -54,12 +54,6 @@ </div> </#macro> -<#macro transactionAccount transaction> - <div class="col s4 l2 xl2 truncate"> - ${transaction.getAccount().getName()} - </div> -</#macro> - <#macro transactionAccountIcon transaction> <#if helpers.getCurrentAccount().getType().name() == "ALL" && transaction.getAccount()??> <#import "../helpers/customSelectMacros.ftl" as customSelectMacros> -- GitLab