kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 01:32:38 +00:00
Code Issues Projects Releases Wiki Activity

Allow HTML tags for the product description column on the stock overview page (fixes #1735)

Browse Source
This commit is contained in:
Bernd Bestel 2022-01-06 13:38:00 +01:00
parent a711bbd8f6
commit 8455b5a64a
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/66_UNRELEASED_xxxx-xx-xx.md
View File

@ -2,4 +2,5 @@
- Optimized relative time display (also fixed a phrasing problem for some languages, e.g. Hungarian) (thanks @Tallyrald)
- When using LDAP authentication, the configured `LDAP_UID_ATTR` is now used to compare if the user already exists instead of the username entered on the login page (that prevents creating multiple users if you entere the username in different notations) (thanks @FloSet)
- Fixed that stock entry labels on purchase were printed, even when "No label" was selected (was only a problem when running label printer WebHooks server side)
- Fixed that formatted (HTML) text for the (hidden by default) product description column on the stock overview page was not correctly displayed
- Fixed that numeric and date-time sorting of table columns on the stock entries page did not work correctly (thanks @MasterofJOKers)

2
views/stockoverview.blade.php
View File

@ -400,7 +400,7 @@
<span class="locale-number locale-number-quantity-amount">{{ $currentStockEntry->min_stock_amount }}</span>
</td>
<td>
{{ $currentStockEntry->product_description }}
{!! $currentStockEntry->product_description !!}
</td>
<td class="product-name-cell cursor-link"
data-product-id="{{ $currentStockEntry->parent_product_id }}">