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

Added option to display birth and death info in descendant report #1610

Merged
merged 1 commit into from
Feb 7, 2024

Conversation

uwagura
Copy link

@uwagura uwagura commented Oct 8, 2023

Made to address Bug #12758. This is a relatively small change, but I made a pull request so that the change and the initial feature request are visible to more experienced developers.

@emyoulation
Copy link
Contributor

This Pull Request now address 2 very different bug reports.

@Nick-Hall - How can they be separated?

12758 : [Descendant Report] birth date display needs to be select optional
12759 : All Family Events [Quickreport] generates 2 error for drag'n'drop of Family level events, and a non-functional "See details"

@uwagura
Copy link
Author

uwagura commented Oct 29, 2023

This was my mistake, I pushed my quickreport change to my master branch without realizing it would effect this pull request. Perhaps if I reset my master branch to it's previous commit and then pushed that change, this pull request will go back to addressing bug 12758 alone, and PR #1613 will address 12759 alone? I've made a new branch to address 12759 and used that branch to make PR #1613, so it shouldn't be effected if I do this.

@uwagura
Copy link
Author

uwagura commented Nov 5, 2023

Perhaps if I reset my master branch to it's previous commit and then pushed that change, this pull request will go back to addressing bug 12758 alone, and PR #1613 will address 12759 alone?

I went ahead and made this change without effecting #1613, so this PR only addresses bug 12758.

@@ -12,7 +12,7 @@
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
Copy link
Member

Choose a reason for hiding this comment

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

Was removal of this line intentional? If not, it should be reintroduced.

Copy link
Author

Choose a reason for hiding this comment

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

It was not intentional, I've gone ahead and reintroduced the line. Thanks for pointing this out!

@uwagura uwagura requested a review from hgohel December 26, 2023 18:14
@hgohel
Copy link
Member

hgohel commented Dec 26, 2023

@uwagura Change looks good!

@Nick-Hall This PR is targeted to gramps master, is it too late to target 5.2 release?

@Nick-Hall
Copy link
Member

is it too late to target 5.2 release?

As this change is small and confined to a single plugin, I think we can accept it for the gramps52 branch.

@hgohel
Copy link
Member

hgohel commented Dec 28, 2023

@uwagura Could you target the maintenance/gramps52 branch for your change? See Changing the base branch of a pull request if needed. Your change will be included in the upcoming release :)

@uwagura uwagura changed the base branch from master to maintenance/gramps52 December 28, 2023 02:50
@uwagura
Copy link
Author

uwagura commented Dec 28, 2023

@hgohel , I've gone ahead and changed the target to maintenance/gramps52, let me know if everything looks good!

@hgohel
Copy link
Member

hgohel commented Dec 28, 2023

@uwagura Thanks. I thought the rebase to maintenance/gramps52 via GitHub would be smarter, but it brought along commits that are not part of your original change. I don't know if there's a way to resolve this using just GitHub (@Nick-Hall ideas?), so it might be better to revert this PR back to the master branch, and create a new PR for the maintenance/gramps52 so that only your changes are brought in.

@uwagura
Copy link
Author

uwagura commented Dec 31, 2023

@hgohel yeah, I wasn't sure why it did that. It looks like if I create a new PR, it still brings along the extra commits. Do you think I could fix the issue if I

1.) make a local branch named "lifespan" containing only the relevant commits
2.) git pull --rebase my local branch to the upstream maintenance/gramps52 branch,
3.) force push my local branch to the lifespan branch tied to this PR on github?

let me know what you think

@QuLogic
Copy link
Contributor

QuLogic commented Dec 31, 2023

Changing the base branch on GitHub does only that. It doesn't do a rebase of the commits for you. You would also need to do the rebase locally and force push in the manner you are suggesting.

@uwagura uwagura force-pushed the lifespan branch 2 times, most recently from 58247de to 20ccba7 Compare January 1, 2024 00:40
@uwagura
Copy link
Author

uwagura commented Jan 1, 2024

I was having trouble with the rebase, so I just pulled the gramps52 branch, manually remade my changes, committed them to a new lifespan branch based off of the gramps52 branch, and then force pushed these changes. It was a bit messier, but I think this pull request should be good now @hgohel . Thank you for your help @QuLogic !

@hgohel
Copy link
Member

hgohel commented Jan 1, 2024

Nice! @uwagura thanks for your contribution, and thanks @QuLogic for jumping to advise.

@Nick-Hall Nick-Hall merged commit 0c3419d into gramps-project:maintenance/gramps52 Feb 7, 2024
2 checks passed
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.

5 participants