patch: fix error on startup #397
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I noticed on the ticket 391 that the modified patch cannot be applied properly on the last version: INFO: Patching Grocy to fix relative URL handling... patching file views/layout/default.blade.php Hunk hassio-addons#1 FAILED at 88. 1 out of 1 hunk FAILED -- saving rejects to file views/layout/default.blade.php.rej I simply tried to apply the patch on top of the latest v4.0.3 release and fixed the conflicts. The context has changed in v4.0: 'ActiveNav' variable has been replaced by 'View' in commit d16d976d0 ("Simplified viewjs / active page handling") in Grocy repo. I don't know if this will fix the recent issues that have been reported (391, 392, 395) because I'm not using this addon yet: I was looking at trying it and I wanted to fix this issue first. Signed-off-by: Matthieu Baerts <matttbe@gmail.com>
|
Regarding the failure reported by the CI, please add the |
frenck
added
the
bugfix
frenck
approved these changes
Oct 14, 2023
|
@frenck thank you for having approved this PR! The CI complained about my initial patch which was 2 weeks old. After having synced my branch with the main one, all checks have passed now! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
I noticed on the ticket 391 that this patch cannot be applied properly on the last version:
I simply tried to apply the patch on top of the latest v4.0.3 release and fixed the conflicts. The context has changed in v4.0:
ActiveNavvariable has been replaced byViewin commit d16d976d0 ("Simplified viewjs / active page handling") in Grocy repo.Related Issues
I don't know if this will fix the recent issues that have been reported (391, 392, 395) because I'm not using this addon yet: I was looking at trying it and I wanted to fix this issue first. That's why I didn't "link" this PR to these issues.