Hot patch more Grocy Javascript braindamage

This commit is contained in:
Franck Nijhof 2021-07-19 14:46:04 +02:00
parent c9f761e253
commit 0cfd135f99
No known key found for this signature in database
GPG key ID: D62583BA8AB11CA3

View file

@ -5,8 +5,9 @@ index fceaaa0..bfc76e6 100644
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
Grocy.Components = { }; Grocy.Components = { };
Grocy.Mode = '{{ GROCY_MODE }}'; Grocy.Mode = '{{ GROCY_MODE }}';
Grocy.BaseUrl = '{{ $U('/') }}'; - Grocy.BaseUrl = '{{ $U('/') }}';
- Grocy.CurrentUrlRelative = "/" + window.location.href.split('?')[0].replace(Grocy.BaseUrl, ""); - Grocy.CurrentUrlRelative = "/" + window.location.href.split('?')[0].replace(Grocy.BaseUrl, "");
+ Grocy.BaseUrl = window.location.origin + '{{ $U('/') }}';
+ Grocy.CurrentUrlRelative = "/" + window.location.pathname.replace(Grocy.BaseUrl, ""); + Grocy.CurrentUrlRelative = "/" + window.location.pathname.replace(Grocy.BaseUrl, "");
Grocy.ActiveNav = '@yield('activeNav', '')'; Grocy.ActiveNav = '@yield('activeNav', '')';
Grocy.Culture = '{{ GROCY_LOCALE }}'; Grocy.Culture = '{{ GROCY_LOCALE }}';