From ee7b3f0a6370f4c7f0f74078ea1a8672509a4ca2 Mon Sep 17 00:00:00 2001 From: briri Date: Thu, 23 Mar 2023 08:59:13 -0700 Subject: [PATCH 1/7] patched issue that was causing template visibility to get set to organisationally_visible when the admin saved --- CHANGELOG.md | 1 + app/views/org_admin/templates/_form.html.erb | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c5a065ac8..998b282ace 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/app/views/org_admin/templates/_form.html.erb b/app/views/org_admin/templates/_form.html.erb index 29c17a05a1..0a6ec2db62 100644 --- a/app/views/org_admin/templates/_form.html.erb +++ b/app/views/org_admin/templates/_form.html.erb @@ -26,6 +26,12 @@ <% end %> +<% else %> + <% + visibility = f.object.visibility + visibility = f.object.funder? ? 'publicly_visible' : 'organisationally_visible' if visibility.nil? + %> + <%= f.hidden_field :visibility, value: visibility %> <% end %>
From 866e480c83eed1a17646115640a6d0e0218eb310 Mon Sep 17 00:00:00 2001 From: briri Date: Thu, 23 Mar 2023 09:16:56 -0700 Subject: [PATCH 2/7] bump node version in github action to try and fix build issue --- .github/workflows/mysql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml index 722690cc6c..a880d1e16c 100644 --- a/.github/workflows/mysql.yml +++ b/.github/workflows/mysql.yml @@ -23,7 +23,7 @@ jobs: bundler-cache: true # Install Node - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: cache: 'yarn' From 8775bab62c8d9d0056970a4ee7d5e89dc53fdeaa Mon Sep 17 00:00:00 2001 From: briri Date: Thu, 23 Mar 2023 09:20:27 -0700 Subject: [PATCH 3/7] bump node version in github action to try and fix build issue --- .github/workflows/mysql.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml index a880d1e16c..df82b9d87f 100644 --- a/.github/workflows/mysql.yml +++ b/.github/workflows/mysql.yml @@ -25,6 +25,7 @@ jobs: # Install Node - uses: actions/setup-node@v3 with: + node-version: '19.6.0' cache: 'yarn' # Copy all of the example configs over From abba4da3e14cec9a44641c83117f5f9d632279e4 Mon Sep 17 00:00:00 2001 From: briri Date: Thu, 23 Mar 2023 09:27:39 -0700 Subject: [PATCH 4/7] bump node version in github action checkout version --- .github/workflows/mysql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml index df82b9d87f..81a7fc7dfe 100644 --- a/.github/workflows/mysql.yml +++ b/.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 From 12af702493460de9eef00e7cd7604a0e2015fd56 Mon Sep 17 00:00:00 2001 From: briri Date: Thu, 23 Mar 2023 09:33:21 -0700 Subject: [PATCH 5/7] add node options to github action to use legacy openssl version --- .github/workflows/mysql.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml index 81a7fc7dfe..3d6a80449f 100644 --- a/.github/workflows/mysql.yml +++ b/.github/workflows/mysql.yml @@ -11,6 +11,8 @@ jobs: DB_ADAPTER: mysql2 MYSQL_PWD: root RAILS_ENV: test + # Added to handle issue compiling assets that was causing OpenSSL to throw: ERR_OSSL_EVP_UNSUPPORTED + NODE_OPTIONS: --openssl-legacy-provider steps: # Checkout the repo From 21d6267e4c0bf3723f65554b80d0f053d7f9a658 Mon Sep 17 00:00:00 2001 From: briri Date: Thu, 23 Mar 2023 09:34:44 -0700 Subject: [PATCH 6/7] revert to node 16.6 --- .github/workflows/mysql.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml index 3d6a80449f..db04917d34 100644 --- a/.github/workflows/mysql.yml +++ b/.github/workflows/mysql.yml @@ -11,8 +11,6 @@ jobs: DB_ADAPTER: mysql2 MYSQL_PWD: root RAILS_ENV: test - # Added to handle issue compiling assets that was causing OpenSSL to throw: ERR_OSSL_EVP_UNSUPPORTED - NODE_OPTIONS: --openssl-legacy-provider steps: # Checkout the repo @@ -27,7 +25,7 @@ jobs: # Install Node - uses: actions/setup-node@v3 with: - node-version: '19.6.0' + node-version: '16.6.0' cache: 'yarn' # Copy all of the example configs over From 160c0f8004e3ef8a0cce48cc4d95a94f14fcfc39 Mon Sep 17 00:00:00 2001 From: briri Date: Thu, 23 Mar 2023 09:39:31 -0700 Subject: [PATCH 7/7] added github action node fix to postgres action --- .github/workflows/postgres.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml index 1a866315b3..6c04c3fc3e 100644 --- a/.github/workflows/postgres.yml +++ b/.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