Merge pull request #406 from DigitalCurationCentre/vyruss/bugfixes

Issues #401, #387
DMPRoadmap · Jun 7, 2017 · f27cfe5 · f27cfe5
2 parents f868df1 + b29360d
commit f27cfe5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
@@ -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 }
  @orgs = (Org.institutions + Org.managing_orgs).flatten.uniq.sort{|x,y| x.name <=> y.name }
 
  # Get the current user's org

diff --git a/app/views/plans/_plan_details.html.erb b/app/views/plans/_plan_details.html.erb
@@ -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' %>