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

CRM-21426: Removed duplicate submit buttons on Cancel/Delete Event Participants #11277

Merged
merged 3 commits into from Nov 15, 2017
Merged

Conversation

ghost
Copy link

@ghost ghost commented Nov 14, 2017

Overview

This PR solves an inconsistency with other confirmation pages which only have one set of buttons instead of two. It removes the buttons at the top of the Cancel Event Participants and Delete Event Participants pages and also changes the title of the submit button from "Continue" to "Cancel Registrations" on the Cancel Event Participants page.

Steps to get to the page:

  1. Go to CiviCRM > Events > Find Participants > Search
  2. Select a few records
  3. From Actions, choose Cancel registration
  4. Repeat the above and from Actions choose Delete registration

Screenshots

Before:

before

After:

after3

Technical Details

  • This PR alters the templates/CRM/Event/Form/Task/Cancel.tpl file to remove the HTML for the buttons at the top of the form.

  • It also alters the CRM/Event/Form/Task/Cancel.tpl file to change the title of the submit button.

Comments

Please review and merge to the master branch.


@civicrm-builder
Copy link

Can one of the admins verify this patch?

@mlutfy
Copy link
Member

mlutfy commented Nov 14, 2017

@mihaelmladenov Thanks for the patch. Can you open a JIRA issue on https://issues.civicrm.org? This is necessary so that the change gets correctly logged in the Release Notes. c.f. https://docs.civicrm.org/dev/en/latest/core/contributing/

@mlutfy
Copy link
Member

mlutfy commented Nov 14, 2017

jenkins, test this please

@ghost
Copy link
Author

ghost commented Nov 14, 2017 via email

@mlutfy
Copy link
Member

mlutfy commented Nov 14, 2017

@mihaelmladenov done!

@ghost
Copy link
Author

ghost commented Nov 14, 2017

@mlutfy Thanks. I've created one:
https://issues.civicrm.org/jira/browse/CRM-21426

@mlutfy mlutfy changed the title NDI-14: Removed duplicate submit buttons on Cancel Event Participants CRM-21426: Removed duplicate submit buttons on Cancel Event Participants Nov 14, 2017
@mlutfy
Copy link
Member

mlutfy commented Nov 14, 2017

I tested this patch (on http://core-11277-19jsu.test-ubu1204-5.civicrm.org).

@mihaelmladenov Could you also fix the "Delete Participants" action?

capture d ecran de 2017-11-14 13-39-20

capture d ecran de 2017-11-14 13-39-32

capture d ecran de 2017-11-14 13-39-59

capture d ecran de 2017-11-14 13-40-14

@ghost
Copy link
Author

ghost commented Nov 14, 2017

@mlutfy This is now done and pushed.

@seamuslee001
Copy link
Contributor

Jenkins ok to test

@mlutfy
Copy link
Member

mlutfy commented Nov 14, 2017

@mihaelmladenov That's a good improvement too, but I was talking about the "Delete Participants" action, it still has the top buttons as well:

capture d ecran de 2017-11-14 13-39-20

Otherwise we're creating an inconsistency, by having Cancel and Delete behave differently.

@ghost
Copy link
Author

ghost commented Nov 14, 2017

@mlutfy This is now also fixed.

@ghost ghost changed the title CRM-21426: Removed duplicate submit buttons on Cancel Event Participants CRM-21426: Removed duplicate submit buttons on Cancel/Delete Event Participants Nov 14, 2017
@colemanw colemanw merged commit 5734a49 into civicrm:master Nov 15, 2017
sluc23 pushed a commit to ixiam/civicrm-core that referenced this pull request Jan 10, 2018
…ent-participants

CRM-21426: Removed duplicate submit buttons on Cancel/Delete Event Participants
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants