From a7dc588ad065d37a8271f5d180da2c96d005bc8e Mon Sep 17 00:00:00 2001
From: Katharina Bogad <katharina@bogad.at>
Date: Fri, 25 Jun 2021 17:58:04 +0200
Subject: [PATCH] Fix more forms

---
 js/components/barcodescanner.js      | 2 +-
 views/quantityunitform.blade.php     | 2 +-
 views/recipeform.blade.php           | 4 ++--
 views/recipeposform.blade.php        | 2 +-
 views/shoppinglistform.blade.php     | 2 +-
 views/shoppinglistitemform.blade.php | 8 ++++++--
 views/userform.blade.php             | 3 ---
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/js/components/barcodescanner.js b/js/components/barcodescanner.js
index 96864d8e..b5466142 100644
--- a/js/components/barcodescanner.js
+++ b/js/components/barcodescanner.js
@@ -286,7 +286,7 @@ class barcodescanner
 				return;
 			}
 
-			this.CheckCapabilities();
+			self.CheckCapabilities();
 
 			Quagga.start();
 		});
diff --git a/views/quantityunitform.blade.php b/views/quantityunitform.blade.php
index 559b1680..8373690a 100644
--- a/views/quantityunitform.blade.php
+++ b/views/quantityunitform.blade.php
@@ -11,7 +11,7 @@
 @section('grocyConfigProps')
 EditMode: '{{ $mode }}',
 @if($mode == 'edit')	
-GrocyConfig.EditObjectId: {{ $quantityUnit->id }},
+EditObjectId: {{ $quantityUnit->id }},
 @endif
 @endsection
 
diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php
index 9dabacfe..a146bfd5 100644
--- a/views/recipeform.blade.php
+++ b/views/recipeform.blade.php
@@ -11,9 +11,9 @@
 @section('grocyConfigProps')
 	EditMode: '{{ $mode }}',
 @if($mode == 'edit')	
-	GrocyConfig.EditObjectId: {{ $recipe->id }},
+	EditObjectId: {{ $recipe->id }},
 @endif
-	QuantityUnits: {!! json_encode($quantityUnits) !!},
+	QuantityUnits: {!! json_encode($quantityunits) !!},
 	QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!},
 	DefaultMinAmount: '{{$DEFAULT_MIN_AMOUNT}}',
 
diff --git a/views/recipeposform.blade.php b/views/recipeposform.blade.php
index adc39aea..18f7f5b6 100644
--- a/views/recipeposform.blade.php
+++ b/views/recipeposform.blade.php
@@ -13,7 +13,7 @@
 	EditObjectParentId: {{ $recipe->id }},
 	EditObject: {!! json_encode($recipePos) !!},
 @if($mode == 'edit')	
-	GrocyConfig.EditObjectId: {{ $recipePos->id }},
+	EditObjectId: {{ $recipePos->id }},
 @endif
 	QuantityUnits: {!! json_encode($quantityUnits) !!},
 	QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!},
diff --git a/views/shoppinglistform.blade.php b/views/shoppinglistform.blade.php
index 37064da6..343fae82 100644
--- a/views/shoppinglistform.blade.php
+++ b/views/shoppinglistform.blade.php
@@ -11,7 +11,7 @@
 @section('grocyConfigProps')
 EditMode: '{{ $mode }}',
 @if($mode == 'edit')	
-GrocyConfig.EditObjectId: {{ $shoppingList->id }},
+EditObjectId: {{ $shoppingList->id }},
 @endif
 @endsection
 
diff --git a/views/shoppinglistitemform.blade.php b/views/shoppinglistitemform.blade.php
index c640d3fb..5c34b400 100644
--- a/views/shoppinglistitemform.blade.php
+++ b/views/shoppinglistitemform.blade.php
@@ -11,7 +11,7 @@
 @section('grocyConfigProps')
 	EditMode: '{{ $mode }}',
 @if($mode == 'edit')	
-	GrocyConfig.EditObjectId: {{ $listItem->id }},
+	EditObjectId: {{ $listItem->id }},
 @endif
 	QuantityUnits: {!! json_encode($quantityUnits) !!},
 	QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!},
@@ -26,8 +26,12 @@
 
 <hr class="my-2">
 
+@php
+$classes = $embedded ? '' : 'col-md-6 col-xl-4';
+@endphp
+
 <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"
 			novalidate>
diff --git a/views/userform.blade.php b/views/userform.blade.php
index fd147cba..5fe46bc3 100644
--- a/views/userform.blade.php
+++ b/views/userform.blade.php
@@ -29,9 +29,6 @@ EditMode: '{{ $mode }}',
 
 <div class="row">
 	<div class="col-lg-6 col-12">
-		<script>
-			GrocyConfig.EditMode = '{{ $mode }}';
-		</script>
 		<form id="user-form"
 			novalidate>