Skip to content
Snippets Groups Projects
Commit 47d90d6b authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#510 - improved naming

parent a277919c
Branches
Tags
No related merge requests found
......@@ -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())
......
......@@ -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
......@@ -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/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment