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

Fix help for financial acls. #13053

Merged
merged 1 commit into from
Nov 4, 2018

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Nov 1, 2018

Overview

Follow up fix on #13047 to get help text on financial acls working on contribution settings page (addresses temporary regression in master / unreleased code)

Before

screenshot 2018-11-05 09 37 12

After

screenshot 2018-11-05 09 40 56

Technical Details

To test this make sure you do a cv flush or similar since setting metadata is cached - also the help text is slow to load locally - not sure why but don't give up :-) (this is not a new slowness)

@mattwire @pradpnayak this is kind of exciting

I've done this by using the field template that is used by entity forms & adding
help to the setting spec (which I'll document).

I noted in this that entityTrait used a different field key for the
documentation link - literally documentation_link whereas I had used field_link
so I fixed settings to match

Comments

Remaining todo list

@@ -48,7 +48,7 @@
'is_contact' => 0,
'description' => ts('This feature allows users to register for more than one event at a time. When enabled, users will add event(s) to a "cart" and then pay for them all at once. Enabling this setting will affect online registration for all active events. The code is an alpha state, and you will potentially need to have developer resources to debug and fix sections of the codebase while testing and deploying it'),
'help_text' => '',
'help_link' => ['page' => 'CiviEvent Cart Checkout', 'resource' => 'wiki'],
'documentation_link' => ['page' => 'CiviEvent Cart Checkout', 'resource' => 'wiki'],
Copy link
Contributor

Choose a reason for hiding this comment

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

@eileenmcnaughton and here too

@seamuslee001
Copy link
Contributor

(CiviCRM Review Template WORD-1.1)

@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 fixed

@@ -35,6 +35,6 @@
</td>
<td>{if $form.$fieldName.html}{if $fieldSpec.formatter === 'crmMoney'}{$form.$fieldName.html|crmMoney}{else}{$form.$fieldName.html}{/if}{else}{$fieldSpec.place_holder}{/if}<br />
{if $fieldSpec.description}<span class="description">{$fieldSpec.description}</span>{/if}
{if $fieldSpec.documentation_link}{docURL page=$fieldSpec.documentation_link.page}{/if}
{if $fieldSpec.documentation_lCink}{docURL page=$fieldSpec.documentation_link.page resource=$fieldSpec.documentation_link.resource}{/if}
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

argh it must have recorded a key stroke in the wrong window

I've done this by using the field template that is used by entity forms & adding
help to the spec (which I'll document).

I noted in this that entityTrait used a different field key for the
documentation link - literally documentation_link whereas I had used field_link
so I fixed settings to match
@seamuslee001
Copy link
Contributor

After re-testing (manually fixing the typo) I can confirm all links work and the ACL help is correct adding merge on pass

@eileenmcnaughton
Copy link
Contributor Author

thanks @seamuslee001

@seamuslee001
Copy link
Contributor

Merging as per the tag

@seamuslee001 seamuslee001 merged commit a33f28e into civicrm:master Nov 4, 2018
@seamuslee001 seamuslee001 deleted the settings_help branch November 4, 2018 23:28
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.

2 participants