Merge branch 'master' into innovation-editor-adoptions-page-fix

department-of-veterans-affairs · Jan 16, 2025 · 3272964 · 3272964
2 parents 8802f95 + 257b105
commit 3272964
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -31,13 +31,13 @@
 | `rails practice_partners:add_new_practice_partners` | Adds new practice partners to the DB based on a spreadsheet provided in March 2022
 #### Ruby version
 
-- `ruby 3.2.5`
+- `ruby 3.3.6`
 
-- `rails ~> 6.1`
+- `rails ~> 7.0`
 
 #### System dependencies
 
-- `ruby 3.2.5`
+- `ruby 3.3.6`
   - Linux-based install `rvm` (Ruby Version Manager) http://rvm.io/
   - `ruby -v`
 - `bundler`

diff --git a/app/controllers/page_resources_controller.rb b/app/controllers/page_resources_controller.rb
@@ -30,15 +30,15 @@ def resource_params
 
   def handle_published_page
     if @page.is_public || current_user
-      redirect_to @page_resource.attachment_s3_presigned_url
+      redirect_to @page_resource.attachment_s3_presigned_url, allow_other_host: true
     else
       unauthorized_response
     end
   end
 
   def handle_user_with_unpublished_practice
     if current_user&.has_role?(:admin)
-      redirect_to @page_resource.attachment_s3_presigned_url
+      redirect_to @page_resource.attachment_s3_presigned_url, allow_other_host: true
     else
       unauthorized_response
     end

diff --git a/app/controllers/practice_resources_controller.rb b/app/controllers/practice_resources_controller.rb
@@ -43,15 +43,15 @@ def resource_params
 
   def handle_enabled_practice
     if @practice.is_public || current_user
-      redirect_to @practice_resource.attachment_s3_presigned_url
+      redirect_to @practice_resource.attachment_s3_presigned_url, allow_other_host: true
     else
       unauthorized_response
     end
   end
 
   def handle_user_with_disabled_practice
     if check_user_practice_permissions
-      redirect_to @practice_resource.attachment_s3_presigned_url
+      redirect_to @practice_resource.attachment_s3_presigned_url, allow_other_host: true
     else
       unauthorized_response
     end

diff --git a/app/controllers/practices_controller.rb b/app/controllers/practices_controller.rb
@@ -350,7 +350,7 @@ def introduction
     @va_facilities_and_crhs = VaFacility.cached_va_facilities.get_relevant_attributes.order_by_state_and_station_name + ClinicalResourceHub.cached_clinical_resource_hubs.sort_by_visn_number
     @categories = Category.prepared_categories_for_practice_editor
     @cached_practice_partners = Naturalsorter::Sorter.sort_by_method(PracticePartner.cached_practice_partners, 'name', true, true)
-    @ordered_practice_partners = PracticePartnerPractice.where(innovable_id: @practice.id).order_by_id
+    @ordered_practice_partners = PracticePartnerPractice.where(innovable_id: @practice.id, innovable_type: "Practice").order_by_id
     @ordered_practice_origin_facilities = PracticeOriginFacility.where(practice_id: @practice.id).order_by_id
     @user_can_edit_communities = current_user.has_role?(:admin)
     @origin_data = JSON.parse(File.read(Rails.root.join('lib', 'assets', 'practice_origin_lookup.json')))

diff --git a/app/controllers/product_multimedia_controller.rb b/app/controllers/product_multimedia_controller.rb
@@ -32,15 +32,15 @@ def resource_params
 
   def handle_enabled_practice
     if @product.is_public || current_user
-      redirect_to @product_resource.attachment_s3_presigned_url
+      redirect_to @product_resource.attachment_s3_presigned_url, allow_other_host: true
     else
       unauthorized_response
     end
   end
 
   def handle_user_with_unpublished_product
     if check_user_product_permissions
-      redirect_to @product_resource.attachment_s3_presigned_url
+      redirect_to @product_resource.attachment_s3_presigned_url, allow_other_host: true
     else
       unauthorized_response
     end

diff --git a/app/mailers/comment_mailer.rb b/app/mailers/comment_mailer.rb
@@ -6,6 +6,6 @@ def report_comment_email(options = {})
         @comment = Commontator::Comment.find(options[:id])
         subject = "A comment has been reported"
 
-        mail(to: '[email protected];[email protected]', subject: subject)
+        mail(to: '[email protected]', subject: subject)
     end
 end
diff --git a/app/views/practices/form/adoptions_forms/_existing_adoption_warning.html.erb b/app/views/practices/form/adoptions_forms/_existing_adoption_warning.html.erb
@@ -8,7 +8,7 @@
       <% end %>
       already exists in the entry list.
       If it is not listed, please
-      <a target="_blank" href="mailto:[email protected]?subject=<%= url_generator('Bug report for Diffusion Marketplace') %>&body=<%= url_generator('Please be sure to include a step-by-step list to reproduce the error, if applicable.') %>">report a bug</a>.
+      <a target="_blank" href="mailto:[email protected]?subject=<%= url_generator('Bug report for Diffusion Marketplace') %>&body=<%= url_generator('Please be sure to include a step-by-step list to reproduce the error, if applicable.') %>">report a bug</a>.
     </p>
   </div>
 </div>