Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- Added popover for org profile page and added explanation for public plan
### Fixed

- 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
Expand Down
6 changes: 6 additions & 0 deletions app/views/org_admin/templates/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down