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

dev/financial#65 - Revert recent changes that cause financial account edit form to be blank #15037

Merged
merged 1 commit into from
Aug 14, 2019

Conversation

demeritcowboy
Copy link
Contributor

Overview

The recent changes prevent the edit form from being assigned the existing values, so it just looks like a blank new form.

Before

Edit form blank.

After

Edit form has existing values.

Technical Details

Comments

https://lab.civicrm.org/dev/financial/issues/65

@civibot
Copy link

civibot bot commented Aug 14, 2019

(Standard links)

@civibot civibot bot added the master label Aug 14, 2019
@@ -53,7 +53,7 @@ public function preProcess() {
$params = [
'id' => $this->_id,
];
$financialAccount = CRM_Financial_BAO_FinancialAccount::retrieve($params);
$financialAccount = CRM_Financial_BAO_FinancialAccount::retrieve($params, CRM_Core_DAO::$_nullArray);
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should use api instead BAO function.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That makes sense but it makes me realize I should put this against the RC and maybe 5.16 too since it's in 5.16. So how about just a revert for the 5.16/RC, and then switch to api for master?

The test fail is because that test was added along with same change I'm reverting, so I guess I need to do something about the test too.

Copy link
Contributor

Choose a reason for hiding this comment

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

@demeritcowboy that makes sense but target the rc first (5.17) - we only backport to the current release once merged to the rc

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Does it update the target label by itself? I'm sure I've done this before and I thought it did it by itself. I rebased against upstream/5.17.

Copy link
Contributor

Choose a reason for hiding this comment

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

@demeritcowboy I just updated the base branch for you (on github ui) so it should now

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh right. That's what I did last time. Thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@pradpnayak I tried the api but it doesn't work for the same reason that the previous change caused problems because then variables don't get set. I'm sure it's doable but it means it's not just a one-line change - I'm not really interested to do more on it.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm happy with the scope of this change - in general we ask less of people when fixing regressions because a) someone is usually responding to a problem they didn't cause & b) the fix is not really optional - so for example I would also be more lax on test expectations on regressions

@eileenmcnaughton eileenmcnaughton changed the base branch from master to 5.17 August 14, 2019 21:10
@civibot civibot bot added 5.17 and removed master labels Aug 14, 2019
@demeritcowboy
Copy link
Contributor Author

With just the & change I was able to create+save, edit+save, and delete a financial account and it seemed ok.

@eileenmcnaughton
Copy link
Contributor

unrelated fail

@eileenmcnaughton eileenmcnaughton merged commit 4a2e07f into civicrm:5.17 Aug 14, 2019
@demeritcowboy demeritcowboy deleted the fin-account-limbo branch August 14, 2019 22:34
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