dev/core#606: Don't redirect to the Option Groups page when page is displayed in a modal

[davialexandre]

Overview

This seems like a regression caused by #12473.

When the Option Group page is open in a modal and the user clicks the "Done" button, they're redirected to the Option Groups page and lose all the data they might have already entered:

Before

After

Clicking "Done" simply closes the modal:

Also, when opened as a full page, it still works as intended by #12473:

Technical Details

The cause of the issue was the change in the button classes. There is no explanation for this change either in the PR or in the Gitlab issue, so I simply reverted it to the previously used class.

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[davialexandre]

cc @mattwire

[mattwire]

Ok tested this and confirmed it is ok to merge. It is a regression from 5.5.0 though only affects editing option groups inline. @eileenmcnaughton This should probably go into the RC?

[colemanw]

Rebasing for the RC, hang on...

[eileenmcnaughton]

@colemanw @totten this could possibly also go against 5.8 for a 5.8.3 release - although it's not recent enough to trigger a 5.8.3 release and we don't have anything else lined up that does qualify at this stage

[colemanw]

I don't feel strongly about it but if someone wants to make a 5.8 pr I'll hit the merge button.

[eileenmcnaughton]

OK -@colemanw - this should also be considered for an ESR 5.7.x release - which I assume you will do at some point

[davialexandre]

Just following up on Eileen's comment above. Will this be considered for the esr, @colemanw?