Convert RecurringEntity form to datepicker #12746
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(Standard links)
|
|
jenkins, test this please |
colemanw
reviewed
Aug 30, 2018
| $("#repeat_absolute_date").prop('disabled', true); | ||
| $("#repeat_absolute_date").removeClass('required'); | ||
| $('#start_action_offset').prop('disabled', true); | ||
| $("#start_action_offset").removeClass('required'); |
There was a problem hiding this comment.
This could be a one-liner in jQuery:
$("#repeat_absolute_date, #start_action_offset").prop('disabled', true).removeClass('required');
colemanw
reviewed
Aug 30, 2018
| } | ||
| else if ($('input[name=ends][value=1]').prop('checked')) { | ||
| $('#start_action_offset').prop('disabled', false); | ||
| $("#start_action_offset").addClass('required').focus(); |
colemanw
reviewed
Aug 30, 2018
| }); | ||
| if ($('input[name=ends][value=2]').prop('checked')) { | ||
| $("#repeat_absolute_date").prop('disabled', false); | ||
| $("#repeat_absolute_date").addClass('required').focus(); |
eff30fc to
aff91e5
Compare
|
@colemanw Thanks, I've updated with your jquery improvements |
|
@civicrm-builder retest this please |
|
I tried creating and editing repeat activities with this PR and I agree it's an improvement :) |
|
test this please |
|
test fails unrelated |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Convert "Repeating entity" form to datepicker. This form is used by the create/edit activity dialog and the repeating events dialog.
Before
Form elements not using datepicker.
After
Form elements using datepicker. Cleaned up form slightly so elements are slightly better aligned, help icons are shown in the right places.
Start date moves down specifically because the first element will automatically receive focus and trigger the datepicker to popup when the form is loaded which is not desirable. I think it also makes sense to be further down.
It was also possible to upset the disable/enable elements code previously so that has also been modified so that it now works correctly.
Technical Details
Comments