Merge pull request #705 from PecanProject/bulk_upload_optional_method

Bulk upload: say method is optional
PecanProject · Jun 24, 2020 · 9c6fcee · 9c6fcee
2 parents 82959cd + 382d119
commit 9c6fcee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,10 +28,13 @@ In this case you can simply pull down the version you want, and run `docker-comp
 - Catch exception when load.bety fails and cleans up /tmp folder
 
 ### Changed
+
+- [#705](https://github.com/PecanProject/bety/pull/705) : More clearly indicate method is optional in bulk upload
 - updated rails to 5.1.7
 - removed static route, it was only used to render 404.
 - allow n=1 in bulk upload https://github.com/PecanProject/bety/pull/704
 
+
 ## [5.3.0] - 2020-04-15
 
 ### Fixes

diff --git a/app/views/bulk_upload/choose_global_data_values.html.erb b/app/views/bulk_upload/choose_global_data_values.html.erb
@@ -89,7 +89,7 @@
       </ul>
       <% end # Data-Set Wide Value specification block %>
       <% if @data_set.trait_data? %>
-      <h2>Specify a Method for Each Trait</h2>
+      <h2>Specify a Method for Each Trait (Optional) </h2>
       <ul>
         <% @heading_variable_info.each_pair do |id, info_hash| %>
           <% name = info_hash[:name] %>