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

[locator] add open form action, automatically open form for non geometric layers #43462

Merged
merged 3 commits into from
Jun 3, 2021

Conversation

3nids
Copy link
Member

@3nids 3nids commented May 31, 2021

instead of showing of warning

This is for the "Active Layer Locator Filter".

I consider this as a bugfix as it replicates what is done in the other similar filter: "All Layers".

@3nids 3nids requested a review from nyalldawson May 31, 2021 12:23
@github-actions github-actions bot added this to the 3.20.0 milestone May 31, 2021
@3nids 3nids enabled auto-merge (squash) June 1, 2021 13:16
@3nids 3nids requested a review from nyalldawson June 2, 2021 13:27
@3nids 3nids merged commit 4a23eb2 into qgis:master Jun 3, 2021
@3nids 3nids deleted the loc-fil-activ-layer-no-geom branch June 3, 2021 04:28
@qgis-bot
Copy link
Collaborator

qgis-bot commented Jun 3, 2021

The backport to release-3_16 failed:

The process '/usr/bin/git' failed with exit code 1

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

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

3nids added a commit to 3nids/QGIS that referenced this pull request Jun 3, 2021
3nids added a commit to 3nids/QGIS that referenced this pull request Jun 10, 2021
nyalldawson pushed a commit that referenced this pull request Jun 10, 2021
nyalldawson pushed a commit that referenced this pull request Jun 14, 2021
nyalldawson pushed a commit that referenced this pull request Jun 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants