Merge branch 'main' into fix-byte-size

Author: briri

.github/workflows/mysql.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
     # Checkout the repo
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     # Install Ruby and run bundler
     - uses: ruby/setup-ruby@v1
@@ -23,8 +23,9 @@ jobs:
         bundler-cache: true
 
     # Install Node
-    - uses: actions/setup-node@v2
+    - uses: actions/setup-node@v3
       with:
+        node-version: '16.6.0'
         cache: 'yarn'
 
     # Copy all of the example configs over

.github/workflows/postgres.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
     # Checkout the repo
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     # Install Ruby and run bundler
     - uses: ruby/setup-ruby@v1
@@ -39,8 +39,9 @@ jobs:
         bundler-cache: true
 
     # Install Node
-    - uses: actions/setup-node@v2
+    - uses: actions/setup-node@v3
       with:
+        node-version: '16.6.0'
         cache: 'yarn'
 
     # Install the Postgres developer packages

CHANGELOG.md

@@ -9,6 +9,7 @@
 ### Fixed
 
 - Fixed an issue that was preventing uses from leaving the research output byte_size field blank
+- Patched issue that was causing template visibility to default to organizationally visible after saving
 - Froze mail gem version [#3254](https://github.com/DMPRoadmap/roadmap/issues/3254)
 - Updated the CSV export so that it now includes research outputs
 - Updated sans-serif font used in PDF downloads to Roboto since Google API no longer offers Helvetica

app/views/org_admin/templates/_form.html.erb

@@ -26,6 +26,12 @@
       <% end %>
     </div>
   </div>
+<% else %>
+  <%
+  visibility = f.object.visibility
+  visibility = f.object.funder? ? 'publicly_visible' : 'organisationally_visible' if visibility.nil?
+  %>
+  <%= f.hidden_field :visibility, value: visibility %>
 <% end %>
 
 <div class="form-group col-xs-8">