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

Fix issue #208

Browse source 
Differentiates between ingress and direct http access by checking the origin url and sets
the baseUrl accordingly.
This commit is contained in:
Artain 2021-11-20 03:01:33 +01:00 • committed by Franck Nijhof
parent 68439cf6db
commit 604f80d784
No known key found for this signature in database
GPG key ID: D62583BA8AB11CA3
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,9 +5,10 @@ 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.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.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 }}';