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.

Sign up for GitHub

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

Jump to bottom

Fix merge features with hidden fields #56825

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix merge features with hidden fields #56825

wants to merge 1 commit into from
+78 −9

Conversation

vaahtokarkki
Copy link

@vaahtokarkki vaahtokarkki commented Mar 12, 2024 •
edited

Description

Merge selected features tool won't merge correctly hidden attribute values. With this PR the tool will use for hidden fields the default value defined for field, or the value from the selected feature, if any is selected.

Fixes #28253
Backport needed for 3.34 and 3.36

@github-actions github-actions bot added this to the 3.38.0 milestone Mar 12, 2024
Joonalai
Joonalai approved these changes Mar 13, 2024
View reviewed changes
Copy link
Contributor

@Joonalai Joonalai left a comment

Choose a reason for hiding this comment

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

Looks good! I just added few minor comments 😄

src/app/qgsmergeattributesdialog.cpp Outdated Show resolved Hide resolved
src/app/qgsmergeattributesdialog.cpp Outdated Show resolved Hide resolved
src/app/qgsmergeattributesdialog.cpp Outdated Show resolved Hide resolved
@vaahtokarkki vaahtokarkki force-pushed the fix-merge-features-with-hidden-fields branch from d6d0395 to 3614991 Compare March 13, 2024 06:32
@Joonalai
Copy link
Contributor

@nyalldawson could you review this as well?

@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 4, 2024

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.

@github-actions github-actions bot added the stale Uh oh! Seems this work is abandoned, and the PR is about to close. label Apr 4, 2024
@Joonalai
Copy link
Contributor

Joonalai commented Apr 4, 2024

Not stale, just waiting for review. Could perhaps some of you @nyalldawson, @3nids, @m-kuhn please review this?

@github-actions github-actions bot removed the stale Uh oh! Seems this work is abandoned, and the PR is about to close. label Apr 4, 2024
@agiudiceandrea agiudiceandrea added the Bug Either a bug report, or a bug fix. Let's hope for the latter! label Apr 10, 2024
@Joonalai Joonalai force-pushed the fix-merge-features-with-hidden-fields branch 2 times, most recently from d3e0639 to dffda6f Compare April 11, 2024 11:42
@vaahtokarkki vaahtokarkki force-pushed the fix-merge-features-with-hidden-fields branch from dffda6f to ad26225 Compare April 11, 2024 12:11
@vaahtokarkki vaahtokarkki mentioned this pull request Apr 17, 2024
Closed
elpaso
elpaso approved these changes Apr 22, 2024
View reviewed changes
tests/src/app/testqgsmergeattributesdialog.cpp Outdated Show resolved Hide resolved
tests/src/app/testqgsmergeattributesdialog.cpp Outdated Show resolved Hide resolved
@vaahtokarkki @Joonalai
Fix merge features with hidden fields
f7ac019 
Instead of ignoring always hidden fields, use field default value or value
from one of merged features. Fixes qgis#28253

Co-authored-by: Joonalai <joona.laine@cofactor.fi>
@vaahtokarkki vaahtokarkki force-pushed the fix-merge-features-with-hidden-fields branch from ad26225 to f7ac019 Compare April 22, 2024 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lnicola lnicola lnicola left review comments

@elpaso elpaso elpaso approved these changes

@Joonalai Joonalai Joonalai approved these changes

Assignees
No one assigned
Labels
backport queued_ltr_backports Queued Backports backport release-3_36 Bug Either a bug report, or a bug fix. Let's hope for the latter!
Projects
None yet
Milestone
3.38.0
Development

Successfully merging this pull request may close these issues.

"Merge Selected Feature" do not works correctly with hidden fields
5 participants
@vaahtokarkki @Joonalai @elpaso @lnicola @agiudiceandrea