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

Minor refactors to support converting custom fields to datepicker fields #15711

Merged
merged 3 commits into from
Nov 3, 2019

Conversation

eileenmcnaughton
Copy link
Contributor

Overview

A couple of minor cleanups - one 'broadens' the code that determines what custom fields are in play on the first round rather than relying on them to be identified later. The other moves code that is not strictly 'select' code out of the select clause

Before

Code nasty

After

Still pretty nasty

Technical Details

@seamuslee001 I've been wrestling with the query on custom fields which is pretty nasty (boo) but tested (yay) and I think it might take a few refactors to get it there. I think it may miss the rc (boo) but it's hard going (also boo). This just fixes some inconsistencies that appear to be part of the pain (small yay) or the confusingness (small yay)

Comments

I've added in _high, _low as the new ones & also _from & _to as I'm having some transitional issues
It's not part of the select clause so having it in there is confusing & mislead. No functional change as it's the next
thin to be called either way
@civibot
Copy link

civibot bot commented Nov 3, 2019

(Standard links)

@civibot civibot bot added the master label Nov 3, 2019
@seamuslee001
Copy link
Contributor

Looks fine to me and yes this is covered in unit tests so merge on pass

@seamuslee001
Copy link
Contributor

@eileenmcnaughton if this misses the RC then that is probably ok, i'm thinking reports may also miss it even tho i got it pretty well packaged up

@seamuslee001 seamuslee001 merged commit a78eeec into civicrm:master Nov 3, 2019
@eileenmcnaughton eileenmcnaughton deleted the cust_ug branch November 3, 2019 07:00
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