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

[ready for core team review] CRM-20793, CRM-20799: Add filter - activity date and status on search criteria of activity listing AND make activity filter user preference an optional setting #10588

Merged
merged 2 commits into from
Jul 10, 2017

Conversation

@monishdeb
Copy link
Member Author

monishdeb commented Jun 30, 2017

@lcdservices as per changes this is how it will represent the 1-row table layout:
image
Tried with restricting the width as much as I can but any further resizing will trim placeholder and doesn't looks good.

And as an alternative I have prepared another patch with 2-rows table layout:
image

NOTE: The display layout will get detoriated due to populating from/to date fields if we choose absolute date range as filter. Need to refactor templates/CRM/Core/DateRange.tpl to fix their position.

@monishdeb monishdeb changed the title CRM-20793: Add filter - activity date and status on search criteria of activity listing CRM-20793, CRM-20799: Add filter - activity date and status on search criteria of activity listing AND make activity filter user preference an optional setting Jul 1, 2017
@monishdeb
Copy link
Member Author

The patch also contains fix for CRM-20799 where add a conditional setting preserve_activity_tab_filter under 'Display Preferences' :
image

@lcdservices
Copy link
Contributor

@monishdeb the labels should consistently be above the fields. see screenshot. Also, in the help text, "contact's" is being visibly escaped. Other than that -- both the filters and setting is working great.

image

@monishdeb
Copy link
Member Author

@lcdservices thanks for your feedback, fixed the label placement and that typo on help text.

@lcdservices
Copy link
Contributor

looks great.

@monishdeb monishdeb changed the title CRM-20793, CRM-20799: Add filter - activity date and status on search criteria of activity listing AND make activity filter user preference an optional setting [ready for core team review] CRM-20793, CRM-20799: Add filter - activity date and status on search criteria of activity listing AND make activity filter user preference an optional setting Jul 6, 2017
@colemanw colemanw merged commit e352275 into civicrm:master Jul 10, 2017
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