v3.0.13

Merge pull request #788 from TechforgoodCAST/develop
TechforgoodCAST · Nov 21, 2018 · a2b8a38 · a2b8a38
2 parents a77344f + cec2e3d
commit a2b8a38
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
@@ -26,7 +26,7 @@ def index
   private
 
     def update_report_if_opportunities_changed!
-      return if @proposal.nil?
+      return if @proposal.nil? || @collection&.opportunities_last_updated_at.nil?
       return if @proposal.updated_at > @collection.opportunities_last_updated_at
 
       Assessment.analyse_and_update!(@collection.funds.active, @proposal)

diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake
@@ -68,7 +68,7 @@ namespace :migrate do
     return puts ': no Proposals' unless proposals.any?
 
     proposals.each do |proposal|
-      if funds.nil?
+      if funds.blank?
         funds = Fund.joins(:themes).active.merge(proposal.themes).distinct
       end