Skip to content

Issues #401, #387 #406

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

Merged
briri merged 2 commits into from
Jun 7, 2017
Merged

Issues #401, #387 #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98a1b08
Fixed faulty description display logic for plans with 1-phase-templat…
Jun 7, 2017
b29360d
Filtering funders with published templates only - Closes #387
Jun 7, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/plans_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def new
authorize @plan

# 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
@orgs = (Org.institutions + Org.managing_orgs).flatten.uniq.sort{|x,y| x.name <=> y.name }

# Get the current user's org
Expand Down
3 changes: 3 additions & 0 deletions app/views/plans/_plan_details.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,9 @@
<!-- If project has phases-->
<% phases = plan.template.phases %>
<% if phases.count == 1 %>
<div class="project_description">
<%= raw plan.template.description %>
</div>
<% phases.each do |phase| %>
<div class="move_2_right">
<%= link_to _('Answer questions'), edit_plan_phase_path(plan,phase), :class => 'btn btn-primary' %>
Expand Down