hassio-addons/addon-grocy
1
0
Fork 0
mirror of https://github.com/hassio-addons/addon-grocy.git synced 2025-05-04 19:21:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapted fix_braindamage.patch for grocy 3.2.0

Browse source 
I just noticed that the [fix_braindamage.patch](https://github.com/hassio-addons/addon-grocy/blob/main/grocy/rootfs/patches/fix_braindamage.patch) patch fails due to [this](51fdefaede) commit.
This commit is contained in:
Oliver F 2022-03-14 10:35:06 +01:00 • committed by Franck Nijhof
parent 7dad321cd4
commit 0ee19b3af4
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
grocy/rootfs/patches/fix_braindamage.patch
View file

@ -2,15 +2,14 @@ diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php
index 4eb3fb8d..d4e5e007 100644
--- a/views/layout/default.blade.php
+++ b/views/layout/default.blade.php
@@ -88,7 +88,10 @@
Grocy.Version = '{{ $version }}';
@@ -88,6 +88,10 @@
Grocy.Mode = '{{ GROCY_MODE }}';
Grocy.BaseUrl = '{{ $U('/') }}';
Grocy.CurrentUrlRelative = "/" + window.location.href.split('?')[0].replace(Grocy.BaseUrl, "");
Grocy.CurrentUrlRelative = "/" + window.location.href.split('?')[0].replace(Grocy.BaseUrl, "");
+ if(Grocy.BaseUrl.indexOf('http') != 0 || Grocy.BaseUrl.indexOf('hassio_ingress') >= 0) {
+ Grocy.BaseUrl = window.location.origin + '{{ $U('/') }}';
+ Grocy.CurrentUrlRelative = "/" + window.location.pathname.replace(Grocy.BaseUrl, "");
+ };
Grocy.ActiveNav = '@yield('activeNav', '')';
Grocy.Culture = '{{ GROCY_LOCALE }}';
Grocy.Currency = '{{ GROCY_CURRENCY }}';
Grocy.CalendarFirstDayOfWeek = '{{ GROCY_CALENDAR_FIRST_DAY_OF_WEEK }}';