Skip to content

Commit e75245c

Browse files
Merge pull request BroadleafCommerce#263 from BroadleafCommerce/fix-listgrid-toone
In the admin Do not display the property value twice with an additional link for ToOneLookups in main entity grids if it the property is already the main entity link
2 parents 38f33eb + 29cde8e commit e75245c

File tree

1 file changed

+1
-1
lines changed
  • admin/broadleaf-open-admin-platform/src/main/resources/open_admin_style/templates/components

1 file changed

+1
-1
lines changed

admin/broadleaf-open-admin-platform/src/main/resources/open_admin_style/templates/components/listGrid.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
th:href="@{${record.path}}"
117117
th:text="${#strings.isEmpty(field.displayValue) ? '(No value set)' : field.displayValue}" />
118118

119-
<span th:if="${headerField.canLinkToExternalEntity and !#strings.isEmpty(field.value)}" th:remove="tag">
119+
<span th:if="${!headerField.mainEntityLink and headerField.canLinkToExternalEntity and !#strings.isEmpty(field.value)}" th:remove="tag">
120120
<span th:remove="tag" th:text="${field.displayValue}" />
121121
<a th:href="@{${headerField.foreignKeyClass + '/' + field.value}}" class="modal-view">
122122
<i class="icon-external-link"></i>

0 commit comments

Comments
 (0)