From 47d90d6be687785169e284c431d5eb1ea9a8ff48 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 24 Oct 2021 16:09:53 +0200
Subject: [PATCH] #510 - improved naming
---
.../de/deadlocker8/budgetmaster/images/MediaController.java | 4 ++--
src/main/resources/templates/helpers/header.ftl | 2 +-
src/main/resources/templates/helpers/iconSelect.ftl | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java b/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java
index f54d91105..056ea1e37 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java
@@ -105,9 +105,9 @@ public class MediaController extends BaseController
return data.toString();
}
- @GetMapping("/getImage/{ID}")
+ @GetMapping("/getImageByIconID/{ID}")
@ResponseBody
- public byte[] getImage(@PathVariable("ID") Integer iconID)
+ public byte[] getImageByIconID(@PathVariable("ID") Integer iconID)
{
Optional<Icon> iconOptional = iconService.getRepository().findById(iconID);
if(iconOptional.isEmpty())
diff --git a/src/main/resources/templates/helpers/header.ftl b/src/main/resources/templates/helpers/header.ftl
index 7b72f707f..aedd306c4 100644
--- a/src/main/resources/templates/helpers/header.ftl
+++ b/src/main/resources/templates/helpers/header.ftl
@@ -149,7 +149,7 @@
<#if entity.getIconReference().isBuiltinIcon()>
<i class="${entity.getIconReference().getBuiltinIdentifier()} ${classes}"></i>
<#else>
- <img src="<@s.url "/media/getImage/" + entity.getIconReference().getID()/>" class="${classes}"/>
+ <img src="<@s.url "/media/getImageByIconID/" + entity.getIconReference().getID()/>" class="${classes}"/>
</#if>
</#if>
</#macro>
\ No newline at end of file
diff --git a/src/main/resources/templates/helpers/iconSelect.ftl b/src/main/resources/templates/helpers/iconSelect.ftl
index 71254b25a..fa0390696 100644
--- a/src/main/resources/templates/helpers/iconSelect.ftl
+++ b/src/main/resources/templates/helpers/iconSelect.ftl
@@ -13,7 +13,7 @@
<div id="${id}" class="valign-wrapper item-icon">
<a id="item-icon-preview">
<i id="builtin-icon-preview-icon" class="<#if hasBuiltinIcon>${item.getIconReference().getBuiltinIdentifier()}<#else>hidden</#if>"></i>
- <img id="item-icon-preview-icon" src="<#if hasImageIcon><@s.url "/media/getImage/" + item.getIconReference().getID()/></#if>" class="item-icon-preview <#if hasImageIcon == false>hidden</#if>"/>
+ <img id="item-icon-preview-icon" src="<#if hasImageIcon><@s.url "/media/getImageByIconID/" + item.getIconReference().getID()/></#if>" class="item-icon-preview <#if hasImageIcon == false>hidden</#if>"/>
<div id="item-icon-placeholder" class="<#if hasImageIcon || hasBuiltinIcon>hidden</#if>">${locale.getString("account.new.icon.placeholder")}</div>
</a>
<@header.buttonFlat url='' icon='delete' id='' localizationKey='' classes="no-padding text-default button-remove-icon-from-item" noUrl=true/>
--
GitLab