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.

Sign up for GitHub

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

Jump to bottom

Report both includes #13639

Merged
merged 3 commits into from
Jan 27, 2017
Merged

Report both includes #13639

merged 3 commits into from
Jan 27, 2017

Commits on Jan 24, 2017

  1. MiqReport::Search#get_cached_page - reduce includes 

    Going forward, will be using only 1 set of includes per report.
At one time, I split these out into 2 fields to reduce sql munging,
but really no need for this change anymore
    @kbrock
    kbrock committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    6fb7f21 View commit details
    Browse the repository at this point in the history

  2. merge include processing for reports and views 

    view "reports" had 2 fields: includes and includes_for_find
reports only had 1 field: includes

before:

get_include_for_find produced includes() from includes field
some code manually merged includes_for_find field

after:

renamed old get_include_for_find to include_as_hash
  It still converts the includes field into an ar includes() hash syntax
new get_include_for_find
  merges includes_for_find field (hash)

so now both reports and views use both fields.
but the nuances of includes vs include_for_field is in a single method
    @kbrock
    kbrock committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    3a6efb0 View commit details
    Browse the repository at this point in the history

  3. fix merge! from cops

    @kbrock
    kbrock committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    5ff3b98 View commit details
    Browse the repository at this point in the history