Fix default location PR

Author: dorner

app/views/donations/_donation_form.html.erb

@@ -39,7 +39,7 @@
       <div class="col-xs-8 col-md-6 col-lg-3">
         <%= f.association :product_drive_participant,
                           collection: @product_drive_participants,
-                          selected: default_location(@donation),
+                          selected: donation_form.product_drive_participant_id,
                           include_blank: true,
                           label_method: lambda { |x| "#{x.try(:business_name) }" },
                           label: "Product Drive Participant",
@@ -67,7 +67,7 @@
                           collection: @storage_locations,
                           label: "Storage Location",
                           error: "Where is it being stored?",
-                          selected: donation_form.storage_location&.id || current_organization.intake_location,
+                          selected: default_location(@donation),
                           include_blank: true,
                           wrapper: :input_group %>
       </div>