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 form filtering when used in feature selection dialog #34336

Merged
merged 1 commit into from
Feb 28, 2020

Conversation

troopa81
Copy link
Contributor

@troopa81 troopa81 commented Feb 6, 2020

Description

Filter expression was not updated on form filtering in feature selection dialog

@troopa81 troopa81 added Bug Either a bug report, or a bug fix. Let's hope for the latter! Forms labels Feb 6, 2020
@stale
Copy link

stale bot commented Feb 20, 2020

The QGIS project highly values your contribution and would love to see this work merged! Unfortunately this PR has not had any activity in the last 14 days and is being automatically marked as "stale". If you think this pull request should be merged, please check

  • that all unit tests are passing

  • that all comments by reviewers have been addressed

  • that there is enough information for reviewers, in particular

    • link to any issues which this pull request fixes

    • add a description of workflows which this pull request fixes

    • add screenshots if applicable

  • that you have written unit tests where possible
    In case you should have any uncertainty, please leave a comment and we will be happy to help you proceed with this pull request.
    If there is no further activity on this pull request, it will be closed in a week.

@stale stale bot added the stale Uh oh! Seems this work is abandoned, and the PR is about to close. label Feb 20, 2020
@troopa81
Copy link
Contributor Author

Don't stale

@stale stale bot removed the stale Uh oh! Seems this work is abandoned, and the PR is about to close. label Feb 24, 2020
@troopa81 troopa81 force-pushed the fix_formfilter_featureselectiondlg branch from 8f0fd2f to f4a3af2 Compare February 27, 2020 08:01
@troopa81
Copy link
Contributor Author

is it OK for merging @m-kuhn ? If so, could you please merge it? Thanks

@m-kuhn m-kuhn merged commit 0a9bbd7 into qgis:master Feb 28, 2020
@m-kuhn
Copy link
Member

m-kuhn commented Feb 28, 2020

Yep, thanks!

@qgis-bot
Copy link
Collaborator

The backport to release-3_12 failed:

The process 'git' failed with exit code 128

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_12 release-3_12
# Navigate to the new working tree
cd .worktrees/backport-release-3_12
# Create a new branch
git switch --create backport-34336-to-release-3_12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0a9bbd724fd36be35e860b67383b812c38c117db
# Push it to GitHub
git push --set-upstream origin backport-34336-to-release-3_12
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_12

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Either a bug report, or a bug fix. Let's hope for the latter! Forms
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants