diff --git a/js/components/batterycard.js b/js/components/batterycard.js index 321b2ae7..1419b59c 100644 --- a/js/components/batterycard.js +++ b/js/components/batterycard.js @@ -9,7 +9,8 @@ class batterycard this.scopeSelector = scopeSelector; this.scope = scopeSelector != null ? $(scopeSelector) : $(document); - var jScope = this.scope; \n\tthis.$ = scopeSelector != null ? (selector) => jScope.find(selector) : $; + var jScope = this.scope; + this.$ = scopeSelector != null ? (selector) => jScope.find(selector) : $; } Refresh(batteryId) diff --git a/js/components/calendarcard.js b/js/components/calendarcard.js index 9ec73e00..1fa65e18 100644 --- a/js/components/calendarcard.js +++ b/js/components/calendarcard.js @@ -6,7 +6,8 @@ class calendarcard this.scopeSelector = scopeSelector; this.scope = scopeSelector != null ? $(scopeSelector) : $(document); - var jScope = this.scope; \n\tthis.$ = scopeSelector != null ? (selector) => jScope.find(selector) : $; + var jScope = this.scope; + this.$ = scopeSelector != null ? (selector) => jScope.find(selector) : $; this.$('#calendar').datetimepicker( { diff --git a/js/components/chorecard.js b/js/components/chorecard.js index 16bc725e..441c5ff0 100644 --- a/js/components/chorecard.js +++ b/js/components/chorecard.js @@ -9,7 +9,8 @@ class chorecard this.scopeSelector = scopeSelector; this.scope = scopeSelector != null ? $(scopeSelector) : $(document); - var jScope = this.scope; \n\tthis.$ = scopeSelector != null ? (selector) => jScope.find(selector) : $; + var jScope = this.scope; + this.$ = scopeSelector != null ? (selector) => jScope.find(selector) : $; } Refresh(choreId) diff --git a/js/grocy.js b/js/grocy.js index 7de7435e..9776f3b4 100644 --- a/js/grocy.js +++ b/js/grocy.js @@ -46,6 +46,9 @@ class GrocyClass this.RecipePictureFileName = config.RecipePictureFileName; this.InstructionManualFileNameName = config.InstructionManualFileNameName; this.Locale = config.Locale; + this.fullcalendarEventSources = config.fullcalendarEventSources; + this.internalRecipes = config.internalRecipes; + this.recipesResolved = config.recipesResolved; this.Components = {}; this.initComponents = []; diff --git a/js/viewjs/calendar.js b/js/viewjs/calendar.js index f941364c..0e4c779f 100644 --- a/js/viewjs/calendar.js +++ b/js/viewjs/calendar.js @@ -1,6 +1,4 @@  -/* global fullcalendarEventSources */ - import { Calendar } from '@fullcalendar/core'; import dayGridPlugin from '@fullcalendar/daygrid'; import bootstrapPlugin from '@fullcalendar/bootstrap'; @@ -38,7 +36,7 @@ function calendarView(Grocy, scope = null) firstDay: firstDay, eventLimit: false, height: "auto", - events: fullcalendarEventSources, + events: Grocy.fullcalendarEventSources, // fullcalendar 4 doesn't translate the default view names (?) // so we have to supply our own. views: { diff --git a/js/viewjs/mealplan.js b/js/viewjs/mealplan.js index 0e975d29..96c9fad5 100644 --- a/js/viewjs/mealplan.js +++ b/js/viewjs/mealplan.js @@ -1,6 +1,4 @@ -/* global fullcalendarEventSources, internalRecipes, recipesResolved */ - -import { Calendar } from '@fullcalendar/core'; +import { Calendar } from '@fullcalendar/core'; import dayGridPlugin from '@fullcalendar/daygrid'; import bootstrapPlugin from '@fullcalendar/bootstrap'; import momentPlugin from '@fullcalendar/moment/main'; @@ -57,7 +55,7 @@ function mealplanView(Grocy, scope = null) }, weekNumbers: false, eventLimit: false, - events: fullcalendarEventSources, + events: Grocy.fullcalendarEventSources, defaultView: (viewport.width() < 768) ? "dayGridDay" : "dayGridWeek", firstDay: firstDay, height: "auto", @@ -85,7 +83,7 @@ function mealplanView(Grocy, scope = null) '); var weekRecipeName = start.year() + "-" + ((start.week() - 1).toString().padStart(2, "0")).toString(); - var weekRecipe = internalRecipes.find(elem => elem.name == weekRecipeName); + var weekRecipe = Grocy.internalRecipes.find(elem => elem.name == weekRecipeName); var weekCosts = 0; var weekRecipeOrderMissingButtonHtml = ""; @@ -93,7 +91,7 @@ function mealplanView(Grocy, scope = null) var weekCostsHtml = ""; if (weekRecipe !== null && weekRecipe !== undefined) // Array.prototype.find returns undefined if not found. { - var recipes = recipesResolved.find(elem => elem.recipe_id == weekRecipe.id); + var recipes = Grocy.recipesResolved.find(elem => elem.recipe_id == weekRecipe.id); if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) { weekCosts = recipes.costs; @@ -130,8 +128,8 @@ function mealplanView(Grocy, scope = null) if (event.type != "note") { var dayRecipeName = toMoment(info.event.start, calendar).format("YYYY-MM-DD"); - var dayRecipe = internalRecipes.find(elem => elem.name == dayRecipeName); - var dayRecipeResolved = recipesResolved.find(elem => elem.recipe_id == dayRecipe.id); + var dayRecipe = Grocy.internalRecipes.find(elem => elem.name == dayRecipeName); + var dayRecipeResolved = Grocy.recipesResolved.find(elem => elem.recipe_id == dayRecipe.id); if (!$scope("#day-summary-" + dayRecipeName).length) // This runs for every event/recipe, so maybe multiple times per day, so only add the day summary once { @@ -158,7 +156,7 @@ function mealplanView(Grocy, scope = null) return false; } - var resolvedRecipe = recipesResolved.find(elem => elem.recipe_id == recipe.id); + var resolvedRecipe = Grocy.recipesResolved.find(elem => elem.recipe_id == recipe.id); element.attr("data-recipe", event.recipe); diff --git a/views/batteryform.blade.php b/views/batteryform.blade.php index 610b1984..a7dbe1f7 100644 --- a/views/batteryform.blade.php +++ b/views/batteryform.blade.php @@ -8,6 +8,13 @@ @section('viewJsName', 'batteryform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') +EditObjectId: {{ $battery->id }}, +@endif +@endsection + @section('content')
@@ -19,17 +26,6 @@
- - - - @if($mode == 'edit') - - @endif -
diff --git a/views/calendar.blade.php b/views/calendar.blade.php index c3489f95..a3d2b257 100644 --- a/views/calendar.blade.php +++ b/views/calendar.blade.php @@ -9,6 +9,9 @@ rel="stylesheet"> @endpush +@section('grocyConfigProps') + fullcalendarEventSources: {!! json_encode([ "events" => $fullcalendarEventSources]) !!}, +@endsection @section('content')
@@ -35,10 +38,6 @@
- -
diff --git a/views/choreform.blade.php b/views/choreform.blade.php index 4fd4d1a9..df7a9d51 100644 --- a/views/choreform.blade.php +++ b/views/choreform.blade.php @@ -8,6 +8,13 @@ @section('viewJsName', 'choreform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') +EditObjectId: {{ $chore->id }}, +@endif +@endsection + @section('content')
@@ -19,16 +26,6 @@
- - - @if($mode == 'edit') - - @endif - diff --git a/views/consume.blade.php b/views/consume.blade.php index a089bbe6..62d1aac6 100644 --- a/views/consume.blade.php +++ b/views/consume.blade.php @@ -4,13 +4,19 @@ @section('activeNav', 'consume') @section('viewJsName', 'consume') -@section('content') - +@section('grocyConfigProps') + QuantityUnits: {!! json_encode($quantityUnits) !!}, + QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, + DefaultMinAmount: '{{$DEFAULT_MIN_AMOUNT}}', +@endsection +@section('forceUserSettings') + @if($embedded) + scan_mode_consume_enabled: false, + @endif +@endsection + +@section('content')
@@ -35,10 +41,6 @@ @if(boolval($userSettings['scan_mode_consume_enabled'])) checked @endif> - @else - @endif
diff --git a/views/equipmentform.blade.php b/views/equipmentform.blade.php index 595ae044..da674860 100644 --- a/views/equipmentform.blade.php +++ b/views/equipmentform.blade.php @@ -8,6 +8,16 @@ @section('viewJsName', 'equipmentform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') +EditObjectId: {{ $equipment->id }}, + @if(!empty($equipment->instruction_manual_file_name)) +InstructionManualFileNameName: '{{ $equipment->instruction_manual_file_name }}', + @endif +@endif +@endsection + @section('content')
@@ -19,22 +29,6 @@
- - - @if($mode == 'edit') - - - @if(!empty($equipment->instruction_manual_file_name)) - - @endif - @endif - diff --git a/views/inventory.blade.php b/views/inventory.blade.php index 90f1898f..114c05db 100644 --- a/views/inventory.blade.php +++ b/views/inventory.blade.php @@ -4,13 +4,13 @@ @section('activeNav', 'inventory') @section('viewJsName', 'inventory') -@section('content') - +@section('grocyConfigProps') + QuantityUnits: {!! json_encode($quantityUnits) !!}, + QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, + DefaultMinAmount: '{{$DEFAULT_MIN_AMOUNT}}', +@endsection +@section('content')

@yield('title')

diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php index 3525e5ad..5ebbfec2 100644 --- a/views/layout/default.blade.php +++ b/views/layout/default.blade.php @@ -88,6 +88,17 @@ UserId: -1, @endif }; + @hasSection('grocyConfigProps') + Object.assign(GrocyConfig, { + @yield('grocyConfigProps') + }); + @endif + + @hasSection('forceUserSettings') + Object.assign(GrocyConfig.UserSettings, { + @yield('forceUserSettings') + }); + @endif diff --git a/views/locationform.blade.php b/views/locationform.blade.php index 2034db37..21d68564 100644 --- a/views/locationform.blade.php +++ b/views/locationform.blade.php @@ -8,6 +8,13 @@ @section('viewJsName', 'locationform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') +EditObjectId: {{ $location->id }}, +@endif +@endsection + @section('content')
@@ -19,15 +26,6 @@
- - - @if($mode == 'edit') - - @endif diff --git a/views/manageapikeys.blade.php b/views/manageapikeys.blade.php index 60638917..13bcebf3 100644 --- a/views/manageapikeys.blade.php +++ b/views/manageapikeys.blade.php @@ -4,10 +4,6 @@ @section('activeNav', '') @section('viewJsName', 'manageapikeys') -@push('pageScripts') - -@endpush - @section('content')
diff --git a/views/mealplan.blade.php b/views/mealplan.blade.php index 4eabed79..7b01cb4b 100644 --- a/views/mealplan.blade.php +++ b/views/mealplan.blade.php @@ -9,18 +9,18 @@ rel="stylesheet"> @endpush +@section('grocyConfigProps') + fullcalendarEventSources: {!! json_encode([ "events" => $fullcalendarEventSources ]) !!}, + internalRecipes: {!! json_encode($internalRecipes) !!}, + recipesResolved: {!! json_encode($recipesResolved) !!}, + + QuantityUnits: {!! json_encode($quantityUnits) !!}, + QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, + + MealPlanFirstDayOfWeek: '{{ GROCY_MEAL_PLAN_FIRST_DAY_OF_WEEK }}', +@endsection + @section('content') - -

@yield('title')

diff --git a/views/productbarcodeform.blade.php b/views/productbarcodeform.blade.php index b7876483..e2261f14 100644 --- a/views/productbarcodeform.blade.php +++ b/views/productbarcodeform.blade.php @@ -8,12 +8,18 @@ @section('viewJsName', 'productbarcodeform') -@section('content') - +@section('grocyConfigProps') + QuantityUnits: {!! json_encode($quantityUnits) !!}, + QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, + EditMode: '{{ $mode }}', +@if($mode == 'edit') + EditObjectId: {{ $barcode->id }}, + EditObject: {!! json_encode($barcode) !!}, +@endif + EditObjectProduct: {!! json_encode($product) !!}, +@endsection +@section('content')
@@ -29,19 +35,6 @@
- - - - @if($mode == 'edit') - - @endif - diff --git a/views/productform.blade.php b/views/productform.blade.php index 64045a9d..b8807060 100644 --- a/views/productform.blade.php +++ b/views/productform.blade.php @@ -8,6 +8,18 @@ @section('viewJsName', 'productform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', + +@if($mode == 'edit') + EditObjectId: {{ $product->id }}, + + @if(!empty($product->picture_file_name)) + ProductPictureFileName: '{{ $product->picture_file_name }}', + @endif +@endif +@endsection + @section('content')
@@ -19,22 +31,6 @@
- - - @if($mode == 'edit') - - - @if(!empty($product->picture_file_name)) - - @endif - @endif - diff --git a/views/productgroupform.blade.php b/views/productgroupform.blade.php index 325f1f77..fb0eb7ee 100644 --- a/views/productgroupform.blade.php +++ b/views/productgroupform.blade.php @@ -8,6 +8,13 @@ @section('viewJsName', 'productgroupform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') +EditObjectId: {{ $group->id }}, +@endif +@endsection + @section('content')
@@ -19,16 +26,6 @@
- - - @if($mode == 'edit') - - @endif - diff --git a/views/purchase.blade.php b/views/purchase.blade.php index 6ee99e11..a271a1dc 100644 --- a/views/purchase.blade.php +++ b/views/purchase.blade.php @@ -4,13 +4,19 @@ @section('activeNav', 'purchase') @section('viewJsName', 'purchase') -@section('content') - +@section('grocyConfigProps') + QuantityUnits: {!! json_encode($quantityUnits) !!}, + QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, + DefaultMinAmount: '{{$DEFAULT_MIN_AMOUNT}}', +@endsection +@section('forceUserSettings') + @if($embedded) + scan_mode_consume_enabled: false, + @endif +@endsection + +@section('content')
@@ -35,10 +41,6 @@ @if(boolval($userSettings['scan_mode_purchase_enabled'])) checked @endif> - @else - @endif
diff --git a/views/quantityunitconversionform.blade.php b/views/quantityunitconversionform.blade.php index e1b9c57b..bf8c35a5 100644 --- a/views/quantityunitconversionform.blade.php +++ b/views/quantityunitconversionform.blade.php @@ -8,6 +8,14 @@ @section('viewJsName', 'quantityunitconversionform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') +EditObjectId: {{ $quConversion->id }}, +@endif +@endsection + + @section('content')
@@ -28,17 +36,6 @@
- - - - @if($mode == 'edit') - - @endif - diff --git a/views/quantityunitform.blade.php b/views/quantityunitform.blade.php index 46785aa0..f2deacf1 100644 --- a/views/quantityunitform.blade.php +++ b/views/quantityunitform.blade.php @@ -8,6 +8,13 @@ @section('viewJsName', 'quantityunitform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') +GrocyConfig.EditObjectId: {{ $quantityUnit->id }}, +@endif +@endsection + @section('content')
@@ -19,16 +26,6 @@
- - - @if($mode == 'edit') - - @endif - diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php index a00ae60f..8dda0616 100644 --- a/views/recipeform.blade.php +++ b/views/recipeform.blade.php @@ -8,28 +8,25 @@ @section('viewJsName', 'recipeform') +@section('grocyConfigProps') + EditMode: '{{ $mode }}', +@if($mode == 'edit') + GrocyConfig.EditObjectId: {{ $recipe->id }}, +@endif + QuantityUnits: {!! json_encode($quantityUnits) !!}, + QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, + DefaultMinAmount: '{{$DEFAULT_MIN_AMOUNT}}', + +@if(!empty($recipe->picture_file_name)) + RecipePictureFileName: '{{ $recipe->picture_file_name }}', +@endif + +@stop + @section('content')

@yield('title')

- - - - @if($mode == 'edit') - - - @if(!empty($recipe->picture_file_name)) - - @endif - @endif
diff --git a/views/recipeposform.blade.php b/views/recipeposform.blade.php index 27bdd65f..be45e4f3 100644 --- a/views/recipeposform.blade.php +++ b/views/recipeposform.blade.php @@ -8,11 +8,24 @@ @section('viewJsName', 'recipeposform') -@section('content') - +@section('grocyConfigProps') + EditMode: '{{ $mode }}', + EditObjectParentId: {{ $recipe->id }}, + EditObject: {!! json_encode($recipePos) !!}, +@if($mode == 'edit') + GrocyConfig.EditObjectId: {{ $recipePos->id }}, +@endif + QuantityUnits: {!! json_encode($quantityUnits) !!}, + QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, + DefaultMinAmount: '{{$DEFAULT_MIN_AMOUNT}}', +@if(!empty($recipe->picture_file_name)) + RecipePictureFileName: '{{ $recipe->picture_file_name }}', +@endif + +@endsection + +@section('content')
@@ -28,20 +41,6 @@
- - - @if($mode == 'edit') - - @endif - diff --git a/views/recipes.blade.php b/views/recipes.blade.php index fd2638c2..2af2f664 100644 --- a/views/recipes.blade.php +++ b/views/recipes.blade.php @@ -4,11 +4,12 @@ @section('activeNav', 'recipes') @section('viewJsName', 'recipes') +@section('grocyConfigProps') + QuantityUnits: {!! json_encode($quantityUnits) !!}, + QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, +@endsection + @section('content') -
diff --git a/views/shoppinglistform.blade.php b/views/shoppinglistform.blade.php index e6c95aa7..3572997b 100644 --- a/views/shoppinglistform.blade.php +++ b/views/shoppinglistform.blade.php @@ -8,6 +8,13 @@ @section('viewJsName', 'shoppinglistform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') +GrocyConfig.EditObjectId: {{ $shoppingList->id }}, +@endif +@endsection + @section('content')
@@ -19,16 +26,6 @@
- - - @if($mode == 'edit') - - @endif - diff --git a/views/shoppinglistitemform.blade.php b/views/shoppinglistitemform.blade.php index 19d22069..d220825a 100644 --- a/views/shoppinglistitemform.blade.php +++ b/views/shoppinglistitemform.blade.php @@ -8,12 +8,16 @@ @section('viewJsName', 'shoppinglistitemform') +@section('grocyConfigProps') + EditMode: '{{ $mode }}', +@if($mode == 'edit') + GrocyConfig.EditObjectId: {{ $listItem->id }}, +@endif + QuantityUnits: {!! json_encode($quantityUnits) !!}, + QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, +@endsection + @section('content') - -

@yield('title')

@@ -24,15 +28,6 @@
- - - @if($mode == 'edit') - - @endif diff --git a/views/shoppinglocationform.blade.php b/views/shoppinglocationform.blade.php index c2a162f4..c05c5b05 100644 --- a/views/shoppinglocationform.blade.php +++ b/views/shoppinglocationform.blade.php @@ -8,6 +8,13 @@ @section('viewJsName', 'shoppinglocationform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') +EditObjectId: {{ $shoppinglocation->id }}, +@endif +@stop + @section('content')
@@ -19,16 +26,6 @@
- - - @if($mode == 'edit') - - @endif - diff --git a/views/stockentryform.blade.php b/views/stockentryform.blade.php index b5f58309..688101da 100644 --- a/views/stockentryform.blade.php +++ b/views/stockentryform.blade.php @@ -3,12 +3,13 @@ @section('title', $__t('Edit stock entry')) @section('viewJsName', 'stockentryform') -@section('content') - +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +EditObjectId: {{ $stockEntry->id }}, +EditObjectProductId: {{ $stockEntry->product_id }, +@endsection +@section('content')

@yield('title')

diff --git a/views/taskcategoryform.blade.php b/views/taskcategoryform.blade.php index baa0e66f..bcde2684 100644 --- a/views/taskcategoryform.blade.php +++ b/views/taskcategoryform.blade.php @@ -8,6 +8,13 @@ @section('viewJsName', 'taskcategoryform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') +EditObjectId: {{ $category->id }}, +@endif +@endsection + @section('content')
@@ -19,16 +26,6 @@
- - - @if($mode == 'edit') - - @endif - diff --git a/views/taskform.blade.php b/views/taskform.blade.php index 3f363099..e4476950 100644 --- a/views/taskform.blade.php +++ b/views/taskform.blade.php @@ -8,6 +8,13 @@ @section('viewJsName', 'taskform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') +EditObjectId: {{ $task->id }}, +@endif +@endsection + @section('content')
@@ -19,16 +26,6 @@
- - - @if($mode == 'edit') - - @endif - diff --git a/views/transfer.blade.php b/views/transfer.blade.php index 3720580a..5fb9a9e5 100644 --- a/views/transfer.blade.php +++ b/views/transfer.blade.php @@ -4,12 +4,13 @@ @section('activeNav', 'transfer') @section('viewJsName', 'transfer') -@section('content') - +@section('grocyConfigProps') + QuantityUnits: {!! json_encode($quantityUnits) !!}, + QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, +@endsection + +@section('content')

@yield('title')

diff --git a/views/userentityform.blade.php b/views/userentityform.blade.php index 6d0d0994..9c59d49d 100644 --- a/views/userentityform.blade.php +++ b/views/userentityform.blade.php @@ -8,6 +8,13 @@ @section('viewJsName', 'userentityform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') +EditObjectId: {{ $userentity->id }}, +@endif +@endsection + @section('content')
@@ -19,16 +26,6 @@
- - - @if($mode == 'edit') - - @endif - diff --git a/views/userfieldform.blade.php b/views/userfieldform.blade.php index 5f118f23..270b0900 100644 --- a/views/userfieldform.blade.php +++ b/views/userfieldform.blade.php @@ -8,6 +8,13 @@ @section('viewJsName', 'userfieldform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') +EditObjectId: {{ $userfield->id }}, +@endif +@endsection + @section('content')
@@ -19,16 +26,6 @@
- - - @if($mode == 'edit') - - @endif - diff --git a/views/userform.blade.php b/views/userform.blade.php index 77ac430e..fd66f95d 100644 --- a/views/userform.blade.php +++ b/views/userform.blade.php @@ -8,6 +8,16 @@ @section('viewJsName', 'userform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +@if($mode == 'edit') + EditObjectId: {{ $user->id }}, + @if(!empty($user->picture_file_name)) + UserPictureFileName: '{{ $user->picture_file_name }}', + @endif +@endif +@endsection + @section('content')
@@ -22,17 +32,6 @@ - - @if($mode == 'edit') - - @endif - diff --git a/views/userobjectform.blade.php b/views/userobjectform.blade.php index 68841e24..c5432dbe 100644 --- a/views/userobjectform.blade.php +++ b/views/userobjectform.blade.php @@ -8,6 +8,15 @@ @section('viewJsName', 'userobjectform') +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +EditObjectParentId: {{ $userentity->id }}, +EditObjectParentName: "{{ $userentity->name }}", +@if($mode == 'edit') +EditObjectId: {{ $userobject->id }}, +@endif +@endsection + @section('content')
@@ -19,18 +28,6 @@
- - - @if($mode == 'edit') - - @endif - diff --git a/views/userpermissions.blade.php b/views/userpermissions.blade.php index d0aa87b8..843b38dd 100644 --- a/views/userpermissions.blade.php +++ b/views/userpermissions.blade.php @@ -4,11 +4,10 @@ @section('activeNav', '') @section('viewJsName', 'userpermissions') -@push('pageScripts') - -@endpush +@section('grocyConfigProps') +EditMode: '{{ $mode }}', +EditObjectId: {{ $user->id }}, +@endsection @push('pageStyles')