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/core#155 Improve Option Groups form #12233

Merged
merged 1 commit into from
Jul 4, 2018

Conversation

mattwire
Copy link
Contributor

@mattwire mattwire commented May 29, 2018

Overview

This adds Enabled/Reserved columns to list and puts buttons at the top as well.

Before

localhost_8000_civicrm_admin_options_reset 1 1

After

localhost_8000_civicrm_admin_options_reset 1

Technical Details

Just changes to the smarty template (and NFC code cleanup).

NOTE see #12235 for follow on

@eileenmcnaughton
Copy link
Contributor

@mattwire this needs a rebase now?

@mattwire mattwire changed the title Improve Option Groups form dev/core#155 Improve Option Groups form May 31, 2018
@eileenmcnaughton
Copy link
Contributor

I think this is Ok to merge - @yashodha maybe you could test this out in exchange for @mattwire testing #12367 - which seems similarly close to merging

One question I have is whether 'anyone' can edit 'is_reserved' - I think for other entities it is a specifically permissioned change - perhaps we need to add a permission? (it would be nice if it were a little bit generic 'Administer reserved entities' or something - but that might be too hard.

@eileenmcnaughton
Copy link
Contributor

@mattwire Ok - so I just tested this & my concern about it giving extra permissions is unfounded - it just gives extra information - so I'm good to merge this.

Looks like you did the review to trade with @yashodha but I got to this first so you might want to suggest another one @yashodha could review in exchange for the review you did on #12367

@eileenmcnaughton eileenmcnaughton merged commit c66b6cb into civicrm:master Jul 4, 2018
@mattwire mattwire deleted the optiongroup_form branch September 25, 2018 11:01
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