github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-05 20:36:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix more forms

Browse Source
This commit is contained in:
Katharina Bogad 2021-06-25 17:58:04 +02:00
parent 05bbb2656b
commit a7dc588ad0
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/barcodescanner.js
View File

@ -286,7 +286,7 @@ class barcodescanner
return; return;
} }
this.CheckCapabilities(); self.CheckCapabilities();
Quagga.start(); Quagga.start();
}); });

2
views/quantityunitform.blade.php
View File

@ -11,7 +11,7 @@
@section('grocyConfigProps') @section('grocyConfigProps')
EditMode: '{{ $mode }}', EditMode: '{{ $mode }}',
@if($mode == 'edit') @if($mode == 'edit')
GrocyConfig.EditObjectId: {{ $quantityUnit->id }}, EditObjectId: {{ $quantityUnit->id }},
@endif @endif
@endsection @endsection

4
views/recipeform.blade.php
View File

@ -11,9 +11,9 @@
@section('grocyConfigProps') @section('grocyConfigProps')
EditMode: '{{ $mode }}', EditMode: '{{ $mode }}',
@if($mode == 'edit') @if($mode == 'edit')
GrocyConfig.EditObjectId: {{ $recipe->id }}, EditObjectId: {{ $recipe->id }},
@endif @endif
QuantityUnits: {!! json_encode($quantityUnits) !!}, QuantityUnits: {!! json_encode($quantityunits) !!},
QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!},
DefaultMinAmount: '{{$DEFAULT_MIN_AMOUNT}}', DefaultMinAmount: '{{$DEFAULT_MIN_AMOUNT}}',

2
views/recipeposform.blade.php
View File

@ -13,7 +13,7 @@
EditObjectParentId: {{ $recipe->id }}, EditObjectParentId: {{ $recipe->id }},
EditObject: {!! json_encode($recipePos) !!}, EditObject: {!! json_encode($recipePos) !!},
@if($mode == 'edit') @if($mode == 'edit')
GrocyConfig.EditObjectId: {{ $recipePos->id }}, EditObjectId: {{ $recipePos->id }},
@endif @endif
QuantityUnits: {!! json_encode($quantityUnits) !!}, QuantityUnits: {!! json_encode($quantityUnits) !!},
QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!},

2
views/shoppinglistform.blade.php
View File

@ -11,7 +11,7 @@
@section('grocyConfigProps') @section('grocyConfigProps')
EditMode: '{{ $mode }}', EditMode: '{{ $mode }}',
@if($mode == 'edit') @if($mode == 'edit')
GrocyConfig.EditObjectId: {{ $shoppingList->id }}, EditObjectId: {{ $shoppingList->id }},
@endif @endif
@endsection @endsection

8
views/shoppinglistitemform.blade.php
View File

@ -11,7 +11,7 @@
@section('grocyConfigProps') @section('grocyConfigProps')
EditMode: '{{ $mode }}', EditMode: '{{ $mode }}',
@if($mode == 'edit') @if($mode == 'edit')
GrocyConfig.EditObjectId: {{ $listItem->id }}, EditObjectId: {{ $listItem->id }},
@endif @endif
QuantityUnits: {!! json_encode($quantityUnits) !!}, QuantityUnits: {!! json_encode($quantityUnits) !!},
QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!},
@ -26,8 +26,12 @@
<hr class="my-2"> <hr class="my-2">
@php
$classes = $embedded ? '' : 'col-md-6 col-xl-4';
@endphp
<div class="row"> <div class="row">
<div class="col-12 col-md-6 col-xl-4 pb-3"> <div class="col-12 {{ $classes }} pb-3">
<form id="shoppinglist-form" <form id="shoppinglist-form"
novalidate> novalidate>

3
views/userform.blade.php
View File

@ -29,9 +29,6 @@ EditMode: '{{ $mode }}',
<div class="row"> <div class="row">
<div class="col-lg-6 col-12"> <div class="col-lg-6 col-12">
<script>
GrocyConfig.EditMode = '{{ $mode }}';
</script>
<form id="user-form" <form id="user-form"
novalidate> novalidate>