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 cloud user information context when loading a new cloud project #5587

Merged
merged 1 commit into from
Aug 26, 2024

Conversation

nirvn
Copy link
Member

@nirvn nirvn commented Aug 24, 2024

This PR fixes missing cloud user details context for expressions when loading a new cloud project.

Long story short here, when we load a new cloud project, the cloud user information having not been saved before is simply not written, and therefore the cloud user information changed signal returns empty values.

@qfield-fairy
Copy link
Collaborator

Copy link
Collaborator

@suricactus suricactus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix! Code looks good. I have not tested myself, but the explanation sounds good!

@nirvn nirvn merged commit df6aa92 into master Aug 26, 2024
41 of 49 checks passed
@nirvn nirvn deleted the cloud_user_details_fix branch August 26, 2024 11:01
@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 ee92f0b90... Fix cloud user information context when loading a new cloud project
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/core/projectinfo.cpp
Auto-merging src/core/projectinfo.h
Auto-merging src/qml/qgismobileapp.qml
CONFLICT (content): Merge conflict in src/qml/qgismobileapp.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-5587-to-release-3_3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ee92f0b903d6f2eee69271becae38ac09b0b3a70
# Push it to GitHub
git push --set-upstream origin backport-5587-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-5587-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.

3 participants