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

Revert "Excape HTML (where needed, for bootbox) (references #996)"

Browse Source 
This reverts commit 0df2590de27c60c18b7db6e056347bd2aff5a887.

Revert "Excape shopping list item notes (references #996)"

This reverts commit 0624b0df594a4353ef25e6b1874565ea52ce7772.
This commit is contained in:
Bernd Bestel 2020-10-14 22:58:26 +02:00
parent c11001467b
commit 08644f95bf
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
20 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/extensions.js
View File

@ -195,8 +195,3 @@ function getQRCodeForAPIKey(apikey_type, apikey_key)
} }
return getQRCodeForContent(content); return getQRCodeForContent(content);
} }
function SanitizeHtml(input)
{
return $("<div/>").text(input).html();
}

2
public/viewjs/batteries.js
View File

@ -21,7 +21,7 @@ $("#search").on("keyup", Delay(function()
$(document).on('click', '.battery-delete-button', function(e) $(document).on('click', '.battery-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-battery-name')); var objectName = $(e.currentTarget).attr('data-battery-name');
var objectId = $(e.currentTarget).attr('data-battery-id'); var objectId = $(e.currentTarget).attr('data-battery-id');
bootbox.confirm({ bootbox.confirm({

2
public/viewjs/chores.js
View File

@ -21,7 +21,7 @@ $("#search").on("keyup", Delay(function()
$(document).on('click', '.chore-delete-button', function(e) $(document).on('click', '.chore-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-chore-name')); var objectName = $(e.currentTarget).attr('data-chore-name');
var objectId = $(e.currentTarget).attr('data-chore-id'); var objectId = $(e.currentTarget).attr('data-chore-id');
bootbox.confirm({ bootbox.confirm({

2
public/viewjs/components/productpicker.js
View File

@ -162,7 +162,7 @@ $('#product_id_text_input').on('blur', function(e)
Grocy.Components.ProductPicker.PopupOpen = true; Grocy.Components.ProductPicker.PopupOpen = true;
bootbox.dialog({ bootbox.dialog({
message: __t('"%s" could not be resolved to a product, how do you want to proceed?', SanitizeHtml(input)), message: __t('"%s" could not be resolved to a product, how do you want to proceed?', input),
title: __t('Create or assign product'), title: __t('Create or assign product'),
onEscape: function() onEscape: function()
{ {

2
public/viewjs/equipment.js
View File

@ -68,7 +68,7 @@ $("#search").on("keyup", Delay(function()
$(document).on('click', '.equipment-delete-button', function(e) $(document).on('click', '.equipment-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-equipment-name')); var objectName = $(e.currentTarget).attr('data-equipment-name');
var objectId = $(e.currentTarget).attr('data-equipment-id'); var objectId = $(e.currentTarget).attr('data-equipment-id');
bootbox.confirm({ bootbox.confirm({

2
public/viewjs/locations.js
View File

@ -21,7 +21,7 @@ $("#search").on("keyup", Delay(function()
$(document).on('click', '.location-delete-button', function(e) $(document).on('click', '.location-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-location-name')); var objectName = $(e.currentTarget).attr('data-location-name');
var objectId = $(e.currentTarget).attr('data-location-id'); var objectId = $(e.currentTarget).attr('data-location-id');
bootbox.confirm({ bootbox.confirm({

4
public/viewjs/mealplan.js
View File

@ -563,7 +563,7 @@ $(document).on('click', '.recipe-order-missing-button', function(e)
// to prevent that the tooltip stays until clicked anywhere else // to prevent that the tooltip stays until clicked anywhere else
document.activeElement.blur(); document.activeElement.blur();
var objectName = SanitizeHtml($(e.currentTarget).attr('data-recipe-name')); var objectName = $(e.currentTarget).attr('data-recipe-name');
var objectId = $(e.currentTarget).attr('data-recipe-id'); var objectId = $(e.currentTarget).attr('data-recipe-id');
var button = $(this); var button = $(this);
var servings = $(e.currentTarget).attr('data-mealplan-servings'); var servings = $(e.currentTarget).attr('data-mealplan-servings');
@ -667,7 +667,7 @@ $(document).on('click', '.recipe-consume-button', function(e)
// to prevent that the tooltip stays until clicked anywhere else // to prevent that the tooltip stays until clicked anywhere else
document.activeElement.blur(); document.activeElement.blur();
var objectName = SanitizeHtml($(e.currentTarget).attr('data-recipe-name')); var objectName = $(e.currentTarget).attr('data-recipe-name');
var objectId = $(e.currentTarget).attr('data-recipe-id'); var objectId = $(e.currentTarget).attr('data-recipe-id');
var servings = $(e.currentTarget).attr('data-mealplan-servings'); var servings = $(e.currentTarget).attr('data-mealplan-servings');

2
public/viewjs/productgroups.js
View File

@ -21,7 +21,7 @@ $("#search").on("keyup", Delay(function()
$(document).on('click', '.product-group-delete-button', function(e) $(document).on('click', '.product-group-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-group-name')); var objectName = $(e.currentTarget).attr('data-group-name');
var objectId = $(e.currentTarget).attr('data-group-id'); var objectId = $(e.currentTarget).attr('data-group-id');
bootbox.confirm({ bootbox.confirm({

2
public/viewjs/products.js
View File

@ -38,7 +38,7 @@ if (typeof GetUriParam("product-group") !== "undefined")
$(document).on('click', '.product-delete-button', function(e) $(document).on('click', '.product-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-product-name')); var objectName = $(e.currentTarget).attr('data-product-name');
var objectId = $(e.currentTarget).attr('data-product-id'); var objectId = $(e.currentTarget).attr('data-product-id');
Grocy.Api.Get('stock/products/' + objectId, Grocy.Api.Get('stock/products/' + objectId,

2
public/viewjs/quantityunits.js
View File

@ -21,7 +21,7 @@ $("#search").on("keyup", Delay(function()
$(document).on('click', '.quantityunit-delete-button', function(e) $(document).on('click', '.quantityunit-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-quantityunit-name')); var objectName = $(e.currentTarget).attr('data-quantityunit-name');
var objectId = $(e.currentTarget).attr('data-quantityunit-id'); var objectId = $(e.currentTarget).attr('data-quantityunit-id');
bootbox.confirm({ bootbox.confirm({

6
public/viewjs/recipeform.js
View File

@ -126,7 +126,7 @@ $('#recipe-form input').keydown(function(event)
$(document).on('click', '.recipe-pos-delete-button', function(e) $(document).on('click', '.recipe-pos-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-recipe-pos-name')); var objectName = $(e.currentTarget).attr('data-recipe-pos-name');
var objectId = $(e.currentTarget).attr('data-recipe-pos-id'); var objectId = $(e.currentTarget).attr('data-recipe-pos-id');
bootbox.confirm({ bootbox.confirm({
@ -163,7 +163,7 @@ $(document).on('click', '.recipe-pos-delete-button', function(e)
$(document).on('click', '.recipe-include-delete-button', function(e) $(document).on('click', '.recipe-include-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-recipe-include-name')); var objectName = $(e.currentTarget).attr('data-recipe-include-name');
var objectId = $(e.currentTarget).attr('data-recipe-include-id'); var objectId = $(e.currentTarget).attr('data-recipe-include-id');
bootbox.confirm({ bootbox.confirm({
@ -200,7 +200,7 @@ $(document).on('click', '.recipe-include-delete-button', function(e)
$(document).on('click', '.recipe-pos-show-note-button', function(e) $(document).on('click', '.recipe-pos-show-note-button', function(e)
{ {
var note = SanitizeHtml($(e.currentTarget).attr('data-recipe-pos-note')); var note = $(e.currentTarget).attr('data-recipe-pos-note');
bootbox.alert(note); bootbox.alert(note);
}); });

6
public/viewjs/recipes.js
View File

@ -98,7 +98,7 @@ $(".recipe-delete").on('click', function(e)
{ {
e.preventDefault(); e.preventDefault();
var objectName = SanitizeHtml($(e.currentTarget).attr('data-recipe-name')); var objectName = $(e.currentTarget).attr('data-recipe-name');
var objectId = $(e.currentTarget).attr('data-recipe-id'); var objectId = $(e.currentTarget).attr('data-recipe-id');
bootbox.confirm({ bootbox.confirm({
@ -135,7 +135,7 @@ $(".recipe-delete").on('click', function(e)
$(document).on('click', '.recipe-shopping-list', function(e) $(document).on('click', '.recipe-shopping-list', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-recipe-name')); var objectName = $(e.currentTarget).attr('data-recipe-name');
var objectId = $(e.currentTarget).attr('data-recipe-id'); var objectId = $(e.currentTarget).attr('data-recipe-id');
bootbox.confirm({ bootbox.confirm({
@ -181,7 +181,7 @@ $(document).on('click', '.recipe-shopping-list', function(e)
$(".recipe-consume").on('click', function(e) $(".recipe-consume").on('click', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-recipe-name')); var objectName = $(e.currentTarget).attr('data-recipe-name');
var objectId = $(e.currentTarget).attr('data-recipe-id'); var objectId = $(e.currentTarget).attr('data-recipe-id');
bootbox.confirm({ bootbox.confirm({

4
public/viewjs/shoppinglist.js
View File

@ -77,7 +77,7 @@ $(".status-filter-message").on("click", function()
$("#delete-selected-shopping-list").on("click", function() $("#delete-selected-shopping-list").on("click", function()
{ {
var objectName = SanitizeHtml($("#selected-shopping-list option:selected").text()); var objectName = $("#selected-shopping-list option:selected").text();
var objectId = $("#selected-shopping-list").val(); var objectId = $("#selected-shopping-list").val();
bootbox.confirm({ bootbox.confirm({
@ -172,7 +172,7 @@ $(document).on('click', '#add-expired-products', function(e)
$(document).on('click', '#clear-shopping-list', function(e) $(document).on('click', '#clear-shopping-list', function(e)
{ {
bootbox.confirm({ bootbox.confirm({
message: __t('Are you sure to empty shopping list "%s"?', SanitizeHtml($("#selected-shopping-list option:selected").text())), message: __t('Are you sure to empty shopping list "%s"?', $("#selected-shopping-list option:selected").text()),
closeButton: false, closeButton: false,
buttons: { buttons: {
confirm: { confirm: {

2
public/viewjs/shoppinglocations.js
View File

@ -21,7 +21,7 @@ $("#search").on("keyup", Delay(function()
$(document).on('click', '.shoppinglocation-delete-button', function(e) $(document).on('click', '.shoppinglocation-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-shoppinglocation-name')); var objectName = $(e.currentTarget).attr('data-shoppinglocation-name');
var objectId = $(e.currentTarget).attr('data-shoppinglocation-id'); var objectId = $(e.currentTarget).attr('data-shoppinglocation-id');
bootbox.confirm({ bootbox.confirm({

2
public/viewjs/taskcategories.js
View File

@ -21,7 +21,7 @@ $("#search").on("keyup", Delay(function()
$(document).on('click', '.task-category-delete-button', function(e) $(document).on('click', '.task-category-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-category-name')); var objectName = $(e.currentTarget).attr('data-category-name');
var objectId = $(e.currentTarget).attr('data-category-id'); var objectId = $(e.currentTarget).attr('data-category-id');
bootbox.confirm({ bootbox.confirm({

2
public/viewjs/tasks.js
View File

@ -119,7 +119,7 @@ $(document).on('click', '.delete-task-button', function(e)
{ {
e.preventDefault(); e.preventDefault();
var objectName = SanitizeHtml($(e.currentTarget).attr('data-task-name')); var objectName = $(e.currentTarget).attr('data-task-name');
var objectId = $(e.currentTarget).attr('data-task-id'); var objectId = $(e.currentTarget).attr('data-task-id');
bootbox.confirm({ bootbox.confirm({

2
public/viewjs/userentities.js
View File

@ -21,7 +21,7 @@ $("#search").on("keyup", Delay(function()
$(document).on('click', '.userentity-delete-button', function(e) $(document).on('click', '.userentity-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-userentity-name')); var objectName = $(e.currentTarget).attr('data-userentity-name');
var objectId = $(e.currentTarget).attr('data-userentity-id'); var objectId = $(e.currentTarget).attr('data-userentity-id');
bootbox.confirm({ bootbox.confirm({

2
public/viewjs/userfields.js
View File

@ -33,7 +33,7 @@ $("#entity-filter").on("change", function()
$(document).on('click', '.userfield-delete-button', function(e) $(document).on('click', '.userfield-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-userfield-name')); var objectName = $(e.currentTarget).attr('data-userfield-name');
var objectId = $(e.currentTarget).attr('data-userfield-id'); var objectId = $(e.currentTarget).attr('data-userfield-id');
bootbox.confirm({ bootbox.confirm({

2
public/viewjs/users.js
View File

@ -21,7 +21,7 @@ $("#search").on("keyup", Delay(function()
$(document).on('click', '.user-delete-button', function(e) $(document).on('click', '.user-delete-button', function(e)
{ {
var objectName = SanitizeHtml($(e.currentTarget).attr('data-user-username')); var objectName = $(e.currentTarget).attr('data-user-username');
var objectId = $(e.currentTarget).attr('data-user-id'); var objectId = $(e.currentTarget).attr('data-user-id');
bootbox.confirm({ bootbox.confirm({

7
views/shoppinglist.blade.php
View File

@ -121,7 +121,8 @@
<select class="form-control" <select class="form-control"
id="status-filter"> id="status-filter">
<option value="all">{{ $__t('All') }}</option> <option value="all">{{ $__t('All') }}</option>
<option class="@if(!GROCY_FEATURE_FLAG_STOCK) d-none @endif" value="belowminstockamount">{{ $__t('Below min. stock amount') }}</option> <option class="@if(!GROCY_FEATURE_FLAG_STOCK) d-none @endif"
value="belowminstockamount">{{ $__t('Below min. stock amount') }}</option>
<option value="xxUNDONExx">{{ $__t('Only undone items') }}</option> <option value="xxUNDONExx">{{ $__t('Only undone items') }}</option>
</select> </select>
</div> </div>
@ -195,7 +196,7 @@
</a> </a>
</td> </td>
<td> <td>
@if(!empty($listItem->product_id)) {{ FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->name }}<br>@endif<em>{!! nl2br(e($listItem->note)) !!}</em> @if(!empty($listItem->product_id)) {{ FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->name }}<br>@endif<em>{!! nl2br($listItem->note) !!}</em>
</td> </td>
<td> <td>
<span class="locale-number locale-number-quantity-amount">{{ $listItem->amount }}</span> @if(!empty($listItem->product_id)){{ $__n($listItem->amount, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name_plural) }}@endif <span class="locale-number locale-number-quantity-amount">{{ $listItem->amount }}</span> @if(!empty($listItem->product_id)){{ $__n($listItem->amount, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name_plural) }}@endif
@ -301,7 +302,7 @@
@foreach($listItems as $listItem) @foreach($listItems as $listItem)
<tr> <tr>
<td> <td>
@if(!empty($listItem->product_id)) {{ FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->name }}<br>@endif<em>{!! nl2br(e($listItem->note)) !!}</em> @if(!empty($listItem->product_id)) {{ FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->name }}<br>@endif<em>{!! nl2br($listItem->note) !!}</em>
</td> </td>
<td> <td>
{{ $listItem->amount }} @if(!empty($listItem->product_id)){{ $__n($listItem->amount, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name_plural) }}@endif {{ $listItem->amount }} @if(!empty($listItem->product_id)){{ $__n($listItem->amount, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name_plural) }}@endif