Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix RelationCombobox not autocompleting on secon feature #5466

Merged
merged 4 commits into from
Jul 23, 2024

Conversation

domi4484
Copy link
Member

@domi4484 domi4484 commented Jul 22, 2024

Reset of the flag isLastKeyPressedReturn was missing.
This issue is happening only when using the enter button of the virtual keyboard

@qfield-fairy
Copy link
Collaborator

qfield-fairy commented Jul 22, 2024

@domi4484 domi4484 marked this pull request as ready for review July 23, 2024 07:20
@domi4484 domi4484 requested a review from nirvn July 23, 2024 07:20
@domi4484 domi4484 changed the title Print some debug info Fix RelationCombobox not autocompleting on secon feature Jul 23, 2024
@nirvn
Copy link
Member

nirvn commented Jul 23, 2024

@domi4484 , nice! good find -- let's backport :)

@domi4484
Copy link
Member Author

@nirvn is there an automated backport or do I need to do it manually?

@nirvn
Copy link
Member

nirvn commented Jul 23, 2024

@domi4484 , you just need to add the ( backport branch_name ) tag to the PR. I've added it earlier.

@nirvn nirvn merged commit d7d5fce into master Jul 23, 2024
25 checks passed
@nirvn nirvn deleted the relationComboApplyAutoCompletiunStylus branch July 23, 2024 08:18
@qfield-fairy
Copy link
Collaborator

The backport to release-3_3 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply fb969a164... Print some debug info
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging src/qml/RelationCombobox.qml
CONFLICT (content): Merge conflict in src/qml/RelationCombobox.qml

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-3_3 release-3_3
# Navigate to the new working tree
cd .worktrees/backport-release-3_3
# Create a new branch
git switch --create backport-5466-to-release-3_3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick fb969a1640c78fd41904a812ebb7910221ee728e,3a533fe550655ed2e146d36935d8d3390fd498e3,89399f391ccd9d89b297d9054ba69406ef537ade,12bfc5a76ea3eb10b0fbc9d995aff0ecf3faf758
# Push it to GitHub
git push --set-upstream origin backport-5466-to-release-3_3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_3

Then, create a pull request where the base branch is release-3_3 and the compare/head branch is backport-5466-to-release-3_3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants