Skip to content

Issues #401, #387 - #406

Merged
briri merged 2 commits into
DMPRoadmap:developmentfrom
DigitalCurationCentre:vyruss/bugfixes
Jun 7, 2017
Merged

Issues #401, #387#406
briri merged 2 commits into
DMPRoadmap:developmentfrom
DigitalCurationCentre:vyruss/bugfixes

Conversation

@vyruss

@vyruss vyruss commented Jun 7, 2017 •
edited
Loading

Copy link
Copy Markdown
Contributor
@vyruss
vyruss requested a review from briri June 7, 2017 18:09
@vyruss vyruss changed the title Fixed faulty description display logic for plans with 1-phase-templat… Jun 7, 2017
vyruss
vyruss commented Jun 7, 2017
View reviewed changes
Comment thread app/controllers/plans_controller.rb

# Get all of the available funders and non-funder orgs
@funders = Org.funders.sort{|x,y| x.name <=> y.name }
@funders = Org.funders.joins(:templates).where(templates: {published: true}).uniq.sort{|x,y| x.name <=> y.name }

@vyruss vyruss Jun 7, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ugly syntax but only generates 1 SQL query instead of looping through orgs/templates

@briri briri Jun 7, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

works for me and is easy to follow
@briri
briri merged commit f27cfe5 into DMPRoadmap:development Jun 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants

@vyruss @briri