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

⬆️ Update Grocy to v3.2.0 (#284)

Browse source 
Co-authored-by: Oliver F <oli-f@users.noreply.github.com>
This commit is contained in:
Marc Alcalà Prieto 2022-03-22 16:36:48 +01:00 • committed by GitHub
parent 8557f74afc
commit c624f64912
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
grocy/DOCS.md
View file

@ -110,6 +110,7 @@ The private key file to use for SSL.
Is used for setting the language. Choose between: Is used for setting the language. Choose between:
- `ca` (Catalan)
- `cs` (Czech) - `cs` (Czech)
- `da` (Danish) - `da` (Danish)
- `de` (German) - `de` (German)

2
grocy/Dockerfile
View file

@ -40,7 +40,7 @@ RUN \
\ \
&& yarn global add modclean \ && yarn global add modclean \
\ \
&& git clone --branch "v3.1.3" --depth=1 \ && git clone --branch "v3.2.0" --depth=1 \
https://github.com/grocy/grocy.git /var/www/grocy \ https://github.com/grocy/grocy.git /var/www/grocy \
\ \
&& cd /var/www/grocy \ && cd /var/www/grocy \

2
grocy/config.yaml
View file

@ -48,7 +48,7 @@ options:
keyfile: privkey.pem keyfile: privkey.pem
schema: schema:
log_level: list(trace|debug|info|notice|warning|error|fatal)? log_level: list(trace|debug|info|notice|warning|error|fatal)?
culture: list(cs|da|de|el_GR|en|en_GB|es|fi|fr|he_IL|hu|it|ja|ko_KR|nl|no|pl|pt_BR|pt_PT|ru|sk_SK|sv_SE|ta|tr|zh_CN|zh_TW) culture: list(ca|cs|da|de|el_GR|en|en_GB|es|fi|fr|he_IL|hu|it|ja|ko_KR|nl|no|pl|pt_BR|pt_PT|ru|sk_SK|sv_SE|ta|tr|zh_CN|zh_TW)
currency: match(^[A-Z]{3}$) currency: match(^[A-Z]{3}$)
entry_page: list(stock|shoppinglist|recipes|chores|tasks|batteries|equipment|calendar|mealplan) entry_page: list(stock|shoppinglist|recipes|chores|tasks|batteries|equipment|calendar|mealplan)
features: features:

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 index 4eb3fb8d..d4e5e007 100644
--- a/views/layout/default.blade.php --- a/views/layout/default.blade.php
+++ b/views/layout/default.blade.php +++ b/views/layout/default.blade.php
@@ -88,7 +88,10 @@ @@ -88,6 +88,10 @@
Grocy.Version = '{{ $version }}';
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, "");
+ if(Grocy.BaseUrl.indexOf('http') != 0 || Grocy.BaseUrl.indexOf('hassio_ingress') >= 0) { + 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.Currency = '{{ GROCY_CURRENCY }}'; Grocy.Currency = '{{ GROCY_CURRENCY }}';
Grocy.CalendarFirstDayOfWeek = '{{ GROCY_CALENDAR_FIRST_DAY_OF_WEEK }}';