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

#652 - fixed null pointer exceptions

parent 917f8277
Branches
Tags
No related merge requests found
Pipeline #5927 failed
......@@ -163,7 +163,7 @@
</#macro>
<#macro accountIcon account accountName classes="" datasetValue="">
<div class="category-circle ${classes} category-square <#if account.getIconReference().isFallbackIcon()>account-square-border</#if>" <#if datasetValue?has_content>data-value="${account.getID()}"</#if>>
<div class="category-circle ${classes} category-square <#if account.getIconReference()?? && account.getIconReference().isFallbackIcon()>account-square-border</#if>" <#if datasetValue?has_content>data-value="${account.getID()}"</#if>>
<span style="color: ${account.getFontColor()}">
<@header.entityIcon entity=account classes="account-select-icon" fallbackName=accountName/>
</span>
......
......@@ -145,6 +145,7 @@
</#macro>
<#macro entityIcon entity classes="" fallbackName="">
<#if entity.getIconReference()??>
<#if entity.getIconReference().isImageIcon()>
<img src="<@s.url "/media/getImageByIconID/" + entity.getIconReference().getID()/>" class="${classes}"/>
<#elseif entity.getIconReference().isBuiltinIcon()>
......@@ -152,4 +153,7 @@
<#else>
${fallbackName?capitalize[0]}
</#if>
<#else>
${fallbackName?capitalize[0]}
</#if>
</#macro>
\ No newline at end of file
......@@ -7,8 +7,8 @@
<i class="fas fa-icons prefix"></i>
<label class="input-label" for="${id}">${locale.getString("account.new.label.icon")}</label>
<#assign hasImageIcon= item.getIconReference().isImageIcon()/>
<#assign hasBuiltinIcon= item.getIconReference().isBuiltinIcon()/>
<#assign hasImageIcon=item.getIconReference()?? && item.getIconReference().isImageIcon()/>
<#assign hasBuiltinIcon=item.getIconReference()?? && item.getIconReference().isBuiltinIcon()/>
<div id="${id}" class="valign-wrapper item-icon">
<a id="item-icon-preview">
......@@ -27,7 +27,7 @@
<#macro modalIconSelect idToFocusOnClose item>
<#assign hasImageIcon=item.getIconReference().isImageIcon()/>
<#assign hasImageIcon=item.getIconReference()?? && item.getIconReference().isImageIcon()/>
<div id="modalIconSelect" class="modal modal-fixed-footer background-color" data-focus-on-close="${idToFocusOnClose}">
<div class="modal-content center-align">
......@@ -68,7 +68,7 @@
</div>
</div>
<#assign hasImageIcon=item.getIconReference().isImageIcon()/>
<#assign hasImageIcon=item.getIconReference()?? && item.getIconReference().isImageIcon()/>
<#if hasImageIcon>
<#assign selectedImageID=item.getIconReference().getImage().getID()?c/>
<#else>
......@@ -103,7 +103,7 @@
</#macro>
<#macro builtinIconOption icon item>
<#assign hasBuiltinIcon=item.getIconReference().isBuiltinIcon()/>
<#assign hasBuiltinIcon=item.getIconReference()?? && item.getIconReference().isBuiltinIcon()/>
<#if hasBuiltinIcon>
<#assign selectedIconName=item.getIconReference().getBuiltinIdentifier()/>
<#else>
......
......@@ -53,7 +53,7 @@
<#macro templateHeader template>
<span style="color: ${template.getFontColor()}">
<#if template.getIconReference().isImageIcon() || template.getIconReference().isBuiltinIcon()>
<#if template.getIconReference()?? && (template.getIconReference().isImageIcon() || template.getIconReference().isBuiltinIcon())>
<@header.entityIcon entity=template classes="template-icon text-default"/>
<#elseif template.getTransferAccount()??>
<i class="material-icons">swap_horiz</i>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment