From d3e842e44e8024e06958c1366914213d8d821018 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@addons.community>
Date: Mon, 5 Apr 2021 16:58:20 +0200
Subject: [PATCH] Fix Grocy current relative URL handling brain-damage (#157)

---
 grocy/Dockerfile                           |  5 +++--
 grocy/rootfs/etc/cont-init.d/grocy.sh      |  5 +++++
 grocy/rootfs/patches/fix_braindamage.patch | 13 +++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 grocy/rootfs/patches/fix_braindamage.patch

diff --git a/grocy/Dockerfile b/grocy/Dockerfile
index 4fb5bfa..c0f55db 100755
--- a/grocy/Dockerfile
+++ b/grocy/Dockerfile
@@ -10,7 +10,10 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN \
     apk add --no-cache \
         nginx=1.18.0-r13 \
+        patch=2.7.6-r6 \
+        php7-ctype=7.4.15-r0 \
         php7-exif=7.4.15-r0 \
+        php7-fileinfo=7.4.15-r0 \
         php7-fpm=7.4.15-r0 \
         php7-gd=7.4.15-r0 \
         php7-json=7.4.15-r0 \
@@ -21,9 +24,7 @@ RUN \
         php7-pdo=7.4.15-r0 \
         php7-simplexml=7.4.15-r0 \
         php7-tokenizer=7.4.15-r0 \
-        php7-fileinfo=7.4.15-r0 \
         php7=7.4.15-r0 \
-        php7-ctype=7.4.15-r0 \
     \
     && apk add --no-cache --virtual .build-dependencies \
         git=2.30.2-r0 \
diff --git a/grocy/rootfs/etc/cont-init.d/grocy.sh b/grocy/rootfs/etc/cont-init.d/grocy.sh
index 7440e49..f880f33 100644
--- a/grocy/rootfs/etc/cont-init.d/grocy.sh
+++ b/grocy/rootfs/etc/cont-init.d/grocy.sh
@@ -23,3 +23,8 @@ fi
 bashio::log.debug 'Symlinking data directory to persistent storage location...'
 rm -f -r /var/www/grocy/data
 ln -s /data/grocy /var/www/grocy/data
+
+# Patch current relative URL handling braindamage
+bashio::log.info "Patching Grocy to fix relative URL handling..."
+cd /var/www/grocy || bashio.exit.nok 'Failed cd'
+patch -p1 < /patches/fix_braindamage.patch || true
diff --git a/grocy/rootfs/patches/fix_braindamage.patch b/grocy/rootfs/patches/fix_braindamage.patch
new file mode 100644
index 0000000..60fa43f
--- /dev/null
+++ b/grocy/rootfs/patches/fix_braindamage.patch
@@ -0,0 +1,13 @@
+diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php
+index fceaaa0..bfc76e6 100644
+--- a/views/layout/default.blade.php
++++ b/views/layout/default.blade.php
+@@ -87,7 +87,7 @@
+ 		Grocy.Components = { };
+ 		Grocy.Mode = '{{ GROCY_MODE }}';
+ 		Grocy.BaseUrl = '{{ $U('/') }}';
+-		Grocy.CurrentUrlRelative = "/" + window.location.href.split('?')[0].replace(Grocy.BaseUrl, "");
++		Grocy.CurrentUrlRelative = "/" + window.location.pathname.replace(Grocy.BaseUrl, "");
+ 		Grocy.ActiveNav = '@yield('activeNav', '')';
+ 		Grocy.Culture = '{{ GROCY_LOCALE }}';
+ 		Grocy.Currency = '{{ GROCY_CURRENCY }}';