Merge pull request #3286 from DMPRoadmap/fix-template-save

Template visibility changed to organizationally_visible

Author: benjaminfaure

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Updated sans-serif font used in PDF downloads to Roboto since Google API no longer offers Helvetica
 - Fixed discrepencies with default/max per_page values for API and UI pagination
 - Updated JS that used to call the TinyMCE `setMode()` function so that it now calls `mode.set()` because the former is now deprecated.
+- Patched an issue that was causing a template's visibility to change to 'organizationally_visible' when saving on the template details page.
 - Fixed an issue with the Rails 6 keyword arguments change that was causing the `paginable_sort_link` to fail
 
 ### Changed

app/controllers/org_admin/templates_controller.rb

@@ -385,9 +385,11 @@ def parse_visibility(args, org)
       # If nil and the org is not a funder, we default to organisational
       # If present, we parse to retrieve the value
       if args[:visibility].nil?
-        org.funder? ? 'publicly_visible' : 'organisationally_visible'
+        org.funder? ? Template.visibilities[:publicly_visible] : Template.visibilities[:organisationally_visible]
+      elsif %w[0 organisationally_visible].include?(args.fetch(:visibility, 'publicly_visible'))
+        Template.visibilities[:organisationally_visible]
       else
-        args.fetch(:visibility, '0') == '1' ? 'organisationally_visible' : 'publicly_visible'
+        Template.visibilities[:publicly_visible]
       end
     end