diff --git a/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java b/src/main/java/de/deadlocker8/budgetmaster/images/MediaController.java index f54d91105e66371f052e7129de6bdac896e0edfc..056ea1e370a1830bf1a4fd60c2f64df73ca2b545 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 7b72f707ffbfea769208d8c7ef284888dd147cbd..aedd306c4927fc79f5d424ce18b914a16a1b6464 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 71254b25af419e717a3989a2bb5227ebf911c1b5..fa03906961bcc35b5b59a862f6a41072addac405 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/>