Merge pull request #3034 from DMPRoadmap/bug-496-plan-grant_number-bu…

…g-found Fix Plan grant_number bug
DMPRoadmap · Sep 23, 2021 · dab960f · dab960f
2 parents 7ffe4de + 0b80c86
commit dab960f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb
@@ -138,8 +138,8 @@ def prepare_coversheet_for_csv(csv, _headings, hash)
            else
              [_("Template: "), _("%{template}") % { template: hash[:template] + hash[:customizer] }]
            end
-    if grant_number.present?
-      csv << [_("Grant number: "), _("%{grant_number}") % { grant_number: grant_number }]
+    if grant&.value.present?
+      csv << [_("Grant number: "), _("%{grant_number}") % { grant_number: grant&.value }]
     end
     if description.present?
       csv << [_("Project abstract: "), _("%{description}") %

diff --git a/app/models/exported_plan.rb b/app/models/exported_plan.rb
@@ -46,7 +46,7 @@ def project_identifier
   end
 
   def grant_title
-    plan.grant_number
+    plan.grant&.value
   end
 
   def principal_investigator

diff --git a/app/views/api/v0/plans/index.json.jbuilder b/app/views/api/v0/plans/index.json.jbuilder
@@ -8,7 +8,7 @@ json.prettify!
 json.array! @plans.each do |plan|
   json.id             plan.id
   json.title          plan.title
-  json.grant_number   plan.grant_number
+  json.grant_number   plan.grant&.value
   json.last_updated   plan.updated_at
   json.creation_date  plan.created_at
   json.test_plan      plan.is_test?

diff --git a/app/views/api/v0/statistics/plans.json.jbuilder b/app/views/api/v0/statistics/plans.json.jbuilder
@@ -4,7 +4,7 @@ json.prettify!
 
 json.plans @org_plans.each do |plan|
   json.id             plan.id
-  json.grant_number   plan.grant_number
+  json.grant_number   plan.grant&.value
   json.title          plan.title
   json.test_plan      plan.is_test?
 

diff --git a/app/views/shared/export/_plan_txt.erb b/app/views/shared/export/_plan_txt.erb
@@ -8,8 +8,8 @@
   <% else %>
 <%= _("Template: ") + @hash[:template] + @hash[:customizer] %>
   <% end %>
-  <% if @plan.grant_number.present? %>
-<%= _("Grant number: ") + @plan.grant_number %>
+  <% if @plan.grant&.value.present? %>
+<%= _("Grant number: ") + @plan.grant&.value %>
   <% end %>
   <% if @plan.description.present? %>
 <%= _("Project abstract: ") %>
@@ -31,7 +31,7 @@
         <%= "#{section[:title]}\n" %>
       <% end %>
       <% section[:questions].each do |question| %>
-        <% if remove_list(@plan).include?(question[:id]) %> 
+        <% if remove_list(@plan).include?(question[:id]) %>
           <% next %>
         <% end %>
         <%# text in this case is an array to accomodate for option_based %>