Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for 3.1.0 formal release #321

Merged
merged 3,557 commits into from
Feb 21, 2023
Merged
Changes from 37 commits
Commits
Show all changes
3557 commits
Select commit Hold shift + click to select a range
001e52a
Merge pull request #3087 from DMPRoadmap/bug_dcc_592_and_645_deleted-…
raycarrick-ed Feb 1, 2022
230aa8d
fix merge conflict
raycarrick-ed Feb 1, 2022
b076ae6
Merge branch 'bug_dcc_674_csv_download_plans_fails_for_admins' of git…
raycarrick-ed Feb 1, 2022
6bcc6a2
rubocop fixes
raycarrick-ed Feb 1, 2022
08e862c
Merge pull request #3085 from DMPRoadmap/bug_dcc_674_csv_download_pla…
raycarrick-ed Feb 1, 2022
61e6d19
Issue#3069 - (DCC Issue 675) - Org Admin and Super Admin searches and
Dec 23, 2021
30d55ec
merge clashes
raycarrick-ed Feb 2, 2022
1c3b679
bad indenting and missing end
raycarrick-ed Feb 2, 2022
fb19b91
rubocop clean up
raycarrick-ed Feb 2, 2022
bcfec24
Merge pull request #3082 from DMPRoadmap/bug_3069_and_dcc_675_paged_r…
raycarrick-ed Feb 2, 2022
35fa595
Issue#dcc2983 - Fix for preventing adding a Contributor via Contributor
Nov 23, 2021
f236ce3
Merge branch 'bug_DCC2983-possible_to_add_contributor_without_a_name'…
raycarrick-ed Feb 2, 2022
d0f301b
clean up name_or_email_presence
raycarrick-ed Feb 2, 2022
b382292
Typo
raycarrick-ed Feb 2, 2022
f4920cf
rubocop
raycarrick-ed Feb 2, 2022
477b981
more rubcocop stuff
raycarrick-ed Feb 2, 2022
3df80e6
fix errors
raycarrick-ed Feb 2, 2022
ec68303
Merge pull request #3071 from DMPRoadmap/bug_DCC2983-possible_to_add_…
raycarrick-ed Feb 2, 2022
33b8b1b
Merge branch 'development' into madmp-research-outputs
briri Feb 2, 2022
8a9cd8f
fixed rubocop
briri Feb 2, 2022
2c047b1
Merge branch 'development' into madmp-research-outputs
briri Feb 2, 2022
4aa76f8
revert change to plans factory
briri Feb 2, 2022
93c914f
fixed merge conflict in paginable/plans_controller.rb
briri Feb 2, 2022
d7a792f
Merge branch 'nicolasfranck-fix_issue_3069' into development
briri Feb 2, 2022
4970ddf
Merge branch 'development' of github.com:DMPRoadmap/roadmap into deve…
briri Feb 2, 2022
6238ca9
translation.io sync
raycarrick-ed Feb 10, 2022
2f068f8
DCC Bug #693 - Fix for pagination of plans retreived using the REST API
Feb 10, 2022
8c140f6
removed trailing 's' on sort_field placeholder in format command on p…
briri Feb 10, 2022
419ea19
Merge branch 'bug_dcc_693_EUR-API1-V0-Plans-Pagination' into development
briri Feb 10, 2022
0e2df4e
upgraded karma JS and bumped gem and JS dependencies
briri Feb 14, 2022
c76d896
Merge pull request #3108 from DMPRoadmap/development
briri Feb 14, 2022
268050a
fix for issue invoking the public page policy for template exports
briri Feb 15, 2022
9f815ff
Merge pull request #3110 from DMPRoadmap/fix-public-page-policy
briri Feb 15, 2022
74b180b
fix for downloading organizationally visible PDFs
briri Feb 15, 2022
cc7c3e3
fix rubocop
briri Feb 15, 2022
0c719e8
Merge pull request #3111 from DMPRoadmap/fix-org-visible-pdf
briri Feb 15, 2022
e5b4ca0
Merge branch 'development' into madmp-research-outputs
briri Feb 25, 2022
699e724
fix issue with display of org links and email
briri Feb 25, 2022
60c70fa
added @babel.core to JS dependencies
briri Feb 25, 2022
99ab653
commented out karma tests
briri Feb 25, 2022
ea91d53
ran yarn install
briri Feb 25, 2022
4ef7b22
DCC bug 697 - Fix for a roadmap-wide bug where the following were
Mar 3, 2022
05e6c1d
Temporarily commented Karma tests as per https://github.com/DMPRoadma…
Mar 3, 2022
8812ec1
Merge pull request #3119 from DMPRoadmap/dcc_bug_697_api_v1_contact_d…
briri Mar 3, 2022
69492e5
Merge branch 'development' into fix-branding-emails-links
briri Mar 3, 2022
30fa844
Merge pull request #3117 from DMPRoadmap/fix-branding-emails-links
briri Mar 3, 2022
3065ea4
Merge branch 'development' into madmp-research-outputs
briri Mar 3, 2022
cb52da1
Issue #2983 - Removed wrongly displayed required * for name and email
Mar 4, 2022
049500f
Merge pull request #3120 from DMPRoadmap/bug_2983_contributor_page_sh…
raycarrick-ed Mar 4, 2022
2392cf8
link to active role to deactivate. See issue 3121
nicolasfranck Mar 7, 2022
e466fb4
missed some other stuff
nicolasfranck Mar 7, 2022
6b11cac
Merge branch 'development' into madmp-research-outputs
briri Mar 7, 2022
bb5941e
Added toggleable guidance/comments section
benjaminfaure Mar 8, 2022
1c2b042
Changed comments section config variable name
benjaminfaure Mar 9, 2022
8e95a5b
Changed fontawesome chevron icon
benjaminfaure Mar 9, 2022
21797d1
translation sync 2022-03-10
raycarrick-ed Mar 10, 2022
8bf1642
Merge pull request #3125 from DMPRoadmap/translation_sync_20220310
briri Mar 10, 2022
b0fa95a
Merge branch 'development' into fix_issue_3121
briri Mar 10, 2022
7f8cc03
DCC Issue 706 - REST API V1 /api/v1/plans is returning publicly visible
Mar 10, 2022
5faa496
Merge branch 'development' into dcc_bug_706_plans__via_api_v1_returni…
johnpinto1 Mar 10, 2022
e2bd97b
Merge pull request #3124 from DMPRoadmap/dcc_bug_706_plans__via_api_v…
briri Mar 10, 2022
a91de7b
Merge branch 'development' into fix_issue_3121
raycarrick-ed Mar 11, 2022
832eae0
Merge pull request #3123 from OPIDoR/feature/toggeable_comments_section
briri Mar 11, 2022
fefe46b
Merge branch 'development' into madmp-research-outputs
briri Mar 11, 2022
2359263
filter roles
nicolasfranck Mar 14, 2022
835cb9a
revert string format token change made during rubocop upgrade
briri Mar 14, 2022
634dc27
updated rubocop rule
briri Mar 14, 2022
0759291
Merge pull request #3128 from DMPRoadmap/revert-string-format-tokens
raycarrick-ed Mar 15, 2022
5bb265f
trans sync after string variable interpretation change
raycarrick-ed Mar 15, 2022
1d63351
Merge pull request #3129 from DMPRoadmap/trans_sync_20220315
briri Mar 15, 2022
13fe10b
fix issue 3038
nicolasfranck Mar 15, 2022
a740f15
DCC BUG 713 - Fix for Org Admins cannot share Plans.
Mar 17, 2022
f1a82d0
DCC BUG #710 - Fix for "Error using unassign_users from a Department …
Mar 17, 2022
379f70d
add validation to new madmp models
nicolasfranck Mar 29, 2022
c832e18
DCC Bug 711 - Fix for broken creation of a Plan using the V0 API.
Mar 28, 2022
58c23e9
DCC bug 711 - Fix for the Rest API call POST /api/v1/plans for Plan
Mar 31, 2022
030831f
Merge pull request #3137 from DMPRoadmap/dcc_bug_711-Creating_plans_u…
briri Mar 31, 2022
ac081f6
Merge branch 'development' into dcc_bug_711-Creating_plans_using_V0_R…
briri Mar 31, 2022
c9f7af5
Merge branch 'development' into dcc_bug_710-Error_using_unassign_user…
briri Mar 31, 2022
9883fcd
fix for broken test
briri Mar 31, 2022
9302d3d
appease rubocop
briri Mar 31, 2022
3e2e2e7
Merge pull request #3135 from DMPRoadmap/dcc_bug_711-Creating_plans_u…
briri Mar 31, 2022
f08aeb6
Merge branch 'development' into dcc_bug_710-Error_using_unassign_user…
briri Mar 31, 2022
d482e17
Merge pull request #3132 from DMPRoadmap/dcc_bug_710-Error_using_unas…
briri Mar 31, 2022
c68189f
Merge branch 'development' into bug_dcc_713_admins_don_have_access_to…
briri Mar 31, 2022
705c94d
Merge pull request #3131 from DMPRoadmap/bug_dcc_713_admins_don_have_…
briri Mar 31, 2022
559d56b
Merge branch 'development' into fix_issue_3126
briri Mar 31, 2022
51e00e5
Merge pull request #3127 from nicolasfranck/fix_issue_3126
briri Mar 31, 2022
e7ed86d
Merge branch 'development' into fix_issue_3121
briri Mar 31, 2022
ae12f0c
Merge pull request #3122 from nicolasfranck/fix_issue_3121
briri Mar 31, 2022
4a7c695
Merge branch 'development' into fix_issue_3038
briri Mar 31, 2022
3c2cf70
Update questions_controller.rb
briri Mar 31, 2022
235624d
Merge pull request #3130 from nicolasfranck/fix_issue_3038
briri Mar 31, 2022
36fc51b
Merge branch 'development' into madmp-research-outputs
briri Mar 31, 2022
a7a2d83
added node_modules to ignored source paths for translation.io ... sho…
briri Mar 31, 2022
6b18c4c
Merge branch 'madmp-research-outputs' of github.com:DMPRoadmap/roadma…
briri Mar 31, 2022
306a608
fixed typo in test
briri Mar 31, 2022
661a952
Merge branch 'madmp-research-outputs' into madmp-research-outputs_val…
briri Mar 31, 2022
8015bb1
fixed rubocop complaints
briri Mar 31, 2022
3bc7561
Merge branch 'nicolasfranck-madmp-research-outputs_validation' into m…
briri Mar 31, 2022
74076b2
updated rspec test for re3data service to use controlled list of term…
briri Apr 5, 2022
69855dc
switch 'min_height' to 'autoresize_min_height' for tinymce
briri Apr 5, 2022
c8ca7a0
add ignore for ruby version EOL in Brakeman
briri Apr 5, 2022
c02a120
Merge branch 'development' into tinymce-size-fix
briri Apr 5, 2022
f7ef1f4
Merge branch 'development' into madmp-research-outputs
briri Apr 5, 2022
ffe7150
updated gem dependencies, pegged bootstrap-sass at 3.4.1 due to an is…
briri Apr 5, 2022
9a68a19
proposal to avoid used unpublished templates
nicolasfranck Apr 5, 2022
7eae937
DCC Feature #345 - Allow Orgs to set a different Help Desk Email Ad…
Apr 6, 2022
a8e1b8a
Merge pull request #3141 from DMPRoadmap/tinymce-size-fix
raycarrick-ed Apr 6, 2022
e93dbb9
Merge branch 'development' into madmp-research-outputs
raycarrick-ed Apr 6, 2022
90520ff
Merge branch 'development' into dcc_bug_345_customising_helpdesk_emai…
briri Apr 6, 2022
935d3de
Update schema.rb
briri Apr 6, 2022
f1110b1
Merge pull request #2992 from DMPRoadmap/madmp-research-outputs
briri Apr 6, 2022
b4ce5dc
Merge branch 'development' into dcc_bug_345_customising_helpdesk_emai…
briri Apr 6, 2022
6648c56
fixed deprecation warning for Pundit
briri Apr 6, 2022
688a768
reran bundler and yarn updates
briri Apr 6, 2022
5f5c8bc
Merge branch 'development' into dependency-updates
briri Apr 6, 2022
b175831
rebuilt gemfile without platform specific info
briri Apr 6, 2022
6445448
fixed issue with capybara-webmock reverting to v 0.1
briri Apr 6, 2022
58a7a59
Merge pull request #3142 from DMPRoadmap/dependency-updates
briri Apr 6, 2022
9d47104
Merge branch 'development' into dcc_bug_345_customising_helpdesk_emai…
briri Apr 6, 2022
8ca9b70
switched helper to use named args and have a default
briri Apr 6, 2022
20a2ea7
fixed typo
briri Apr 6, 2022
04ae2c5
tweak to email_signature to reduce confusion over helpdesk_email var …
briri Apr 6, 2022
f3836fe
updated mailer to use named arg for helpdesk_emai
briri Apr 6, 2022
347365d
Merge pull request #3140 from DMPRoadmap/dcc_bug_345_customising_help…
briri Apr 6, 2022
c3b9e8e
Merge branch 'development' into fix_unpublish_template
briri Apr 6, 2022
acd8db8
turned madmp features on
briri Apr 6, 2022
b5751eb
Merge branch 'development' of github.com:DMPRoadmap/roadmap into deve…
briri Apr 6, 2022
14c208a
minor fixes for madmp researcch_outputs functionality
briri Apr 6, 2022
1d4f5b7
Merge branch 'development' into fix_unpublish_template
briri Apr 6, 2022
ce5e0cf
updated translations for v3.0.7
raycarrick-ed Apr 7, 2022
958cb10
make rubocop happy
nicolasfranck Apr 7, 2022
2dd408e
Merge branch 'fix_unpublish_template' of github.com:nicolasfranck/roa…
nicolasfranck Apr 7, 2022
2335f89
Merge pull request #3147 from DMPRoadmap/translations_april_2022
briri Apr 7, 2022
dbc9e2f
Merge branch 'development' into fix_unpublish_template
briri Apr 7, 2022
4eef78d
Merge pull request #3143 from nicolasfranck/fix_unpublish_template
briri Apr 7, 2022
bf05372
Merge branch 'master' into development
briri Apr 7, 2022
9589862
Merge pull request #3146 from DMPRoadmap/development
briri Apr 8, 2022
c09aac4
fix issue with string token for model save errors
briri Apr 12, 2022
2af397c
fix issue with logos disappearing when other Org data is saved
briri Apr 12, 2022
0e90c1b
fix issue where address lines that include a comma are interpretted a…
briri Apr 12, 2022
585b58d
Merge pull request #3153 from DMPRoadmap/patch-contact-us
raycarrick-ed Apr 14, 2022
ac99b72
Merge pull request #3152 from DMPRoadmap/patch-logo-deletion
raycarrick-ed Apr 14, 2022
7cac435
Merge pull request #3150 from DMPRoadmap/patch-error-msgs
raycarrick-ed Apr 14, 2022
88d4f7f
use full version of DMPRoadmap for view, model and controller as well…
pengyin-shan Apr 20, 2022
a3f6916
test merge
pengyin-shan Apr 20, 2022
94b9a3f
test push
pengyin-shan Apr 20, 2022
85c262a
merge other folders
pengyin-shan Apr 21, 2022
25a96c8
replace policy folder to remote version
pengyin-shan Apr 21, 2022
8a35a48
no modification in javascript
pengyin-shan Apr 21, 2022
ca523dc
init test on local
pengyin-shan May 18, 2022
dcc14f0
test jwt setup
pengyin-shan Jun 6, 2022
640cfbf
Merge branch 'integration' into 3.1.0
pengyin-shan Jun 6, 2022
f8cd484
use old test seed file
pengyin-shan Jun 6, 2022
8a0165d
Merge branch '3.1.0' of github.com:portagenetwork/roadmap into 3.1.0
pengyin-shan Jun 6, 2022
4ff9094
remote extra lanuage setting in test seed
pengyin-shan Jun 6, 2022
4eaa6f9
remove extra webpacker compile
pengyin-shan Jun 6, 2022
b3594e9
fix jwt_web_token credential issue
pengyin-shan Jun 7, 2022
e84de22
test yarn install without caching in github action
pengyin-shan Jun 7, 2022
ed93835
add babel-loader to yarn install in dev only
pengyin-shan Jun 7, 2022
d19f80d
use npm install for babel-loader instead of adding it to yarn
pengyin-shan Jun 7, 2022
b18ca83
add babel-loader package using npm
pengyin-shan Jun 7, 2022
0deedd8
comment out yarn test following DMPTool
pengyin-shan Jun 7, 2022
ea04536
try to force node to version 12
pengyin-shan Jun 7, 2022
52781ad
reverse node version change
pengyin-shan Jun 7, 2022
a9a20b3
re generate packs in Github action
pengyin-shan Jun 7, 2022
513ab8e
fix github workflow
pengyin-shan Jun 7, 2022
3886f5d
remove babel.config.js
pengyin-shan Jun 7, 2022
4b47975
add env for webpacker precompile only to test
pengyin-shan Jun 7, 2022
34c96c6
test RAILS_ENV=test
pengyin-shan Jun 7, 2022
4a305ec
debug webpacker workflow
pengyin-shan Jun 7, 2022
9ab0f86
test github workflow
pengyin-shan Jun 7, 2022
a34b26f
test github workflow
pengyin-shan Jun 7, 2022
07c69f2
test github workflow
pengyin-shan Jun 7, 2022
99754fd
test github workflow
pengyin-shan Jun 7, 2022
d829cec
swith webpacker compile process to test
pengyin-shan Jun 7, 2022
2bceaeb
test remove certain folder
pengyin-shan Jun 8, 2022
10e2a3e
test remove certain folder
pengyin-shan Jun 8, 2022
22bc91d
remove webpacker recompile
pengyin-shan Jun 8, 2022
8f2e60c
test development setting in workflow
pengyin-shan Jun 8, 2022
f068579
remove webpack-cli from package.json
pengyin-shan Jun 8, 2022
157028d
temporary output webpack compile output
pengyin-shan Jun 8, 2022
27764f4
remove webpacker compile output after rsolve the Github workflow issue
pengyin-shan Jun 8, 2022
669b2a6
for test in uat
pengyin-shan Jul 14, 2022
8983c4b
test in uat
pengyin-shan Jul 14, 2022
0287a31
test in uat
pengyin-shan Jul 14, 2022
91412c6
temp commit for switch computer
pengyin-shan Aug 4, 2022
c326005
test disable bootsnap
pengyin-shan Aug 17, 2022
d2e8c86
user migration finish
pengyin-shan Aug 23, 2022
e1e437b
test PosgreSQL Github Test
pengyin-shan Sep 13, 2022
dac81b2
reverse changes made for json test back to match 3.1.0 in DMPRoadmap
pengyin-shan Sep 15, 2022
888ccc4
update .gitignore to include seed data
pengyin-shan Sep 15, 2022
d78963e
raise language to the first part of test seeding file
pengyin-shan Sep 15, 2022
3e68e20
update to reverse some existing DMP Assisant changes
pengyin-shan Sep 19, 2022
11700e5
reverse local changes for issue68
Sep 19, 2022
f266fc7
reverse PR Add translated reading access methods
pengyin-shan Sep 21, 2022
186afe7
translation changes only. Plus reverse some debug settings back
pengyin-shan Oct 3, 2022
7024cd4
init push after 3.1.0 with rubocop auto-correct only
pengyin-shan Oct 4, 2022
2abff63
with_all_issues_checked
pengyin-shan Nov 21, 2022
4f7aaec
fix production.rb
pengyin-shan Nov 21, 2022
f2926ed
allow MySQl and PostgreSQL both run as Github test
pengyin-shan Nov 21, 2022
f80c5dc
update rubocop version and yml
pengyin-shan Nov 22, 2022
6b92c40
rubocop auto fix first
pengyin-shan Nov 22, 2022
a780ffa
update Gemfile.lock to ruby 2.7.6 and bundler 2.3.25 for fixing the e…
pengyin-shan Nov 22, 2022
3466fda
test fixing #265 by upgrading to checkout@v3 and ruby@v1
pengyin-shan Nov 22, 2022
0fcf5e0
fix #266: change to ubuntu20.04 for wkhtmltopdf-binary
pengyin-shan Nov 23, 2022
9a4a956
match #264 for rubocop fix and its subtasks
pengyin-shan Nov 25, 2022
c7e1d4e
fix base_service_spec.rb extra while
pengyin-shan Nov 28, 2022
b362675
finish final check. update Gemfile and yarm
pengyin-shan Dec 9, 2022
8b383b6
upgrade Danger to 9.0 based on Github request
pengyin-shan Dec 9, 2022
ea67c4d
update Gemfile.lock to include supported platforms
pengyin-shan Dec 9, 2022
d4564f8
fix comflict
pengyin-shan Dec 9, 2022
dd2be94
fix rubocop error
pengyin-shan Dec 9, 2022
9fc43c4
fix dangerfile error
pengyin-shan Dec 9, 2022
a3dd06a
change raise to fail to avoid danger problem
pengyin-shan Dec 9, 2022
e6e6bda
fix translation.io issue and issues found in UAT test
pengyin-shan Jan 24, 2023
4724f6b
rubocop fixes
pengyin-shan Jan 24, 2023
3011546
add secrets to production env
pengyin-shan Jan 24, 2023
8541a9f
add secrets to database.yml
pengyin-shan Jan 24, 2023
6f3d97a
reverse translation.io setting
pengyin-shan Jan 25, 2023
b7335d0
rubocop fix for translation.rb
pengyin-shan Jan 25, 2023
1d8b687
rubocop fix the syntax of translation.rb
pengyin-shan Jan 25, 2023
e15e089
add missing secrets to database.yml
pengyin-shan Jan 25, 2023
52a09c2
fix issue260 and fix flagtzhu complain via docker. refresh yarm.lock
pengyin-shan Jan 27, 2023
39aa9b6
update staging.rb in seeds to have same seeding process as production.rb
pengyin-shan Feb 1, 2023
1eded33
resolve issue308 by restore title and description public methods
pengyin-shan Feb 2, 2023
4b1a3f8
Merge pull request #309 from portagenetwork/issue308
pengyin-shan Feb 2, 2023
86fe2f2
add static page for 3.1.0 upgrade
pengyin-shan Feb 6, 2023
2bb3e34
Merge pull request #311 from portagenetwork/issue310
pengyin-shan Feb 6, 2023
d5b1edf
resolve confliction with integration branch
pengyin-shan Feb 13, 2023
b0d5de0
re-generate Gemfile.lock and yarm.lock
pengyin-shan Feb 13, 2023
661d0db
fix issue316 after rubocop upgrade to 1.45
pengyin-shan Feb 13, 2023
41c946a
add french translation to research output
pengyin-shan Feb 14, 2023
e427319
update french translation. 6 min for translation:sync
pengyin-shan Feb 14, 2023
7d8a6d6
add x86_64-linux to Gemfile.lock to support linux engine
pengyin-shan Feb 14, 2023
4c8695a
add ignore path to translation and configure translation.io source code
pengyin-shan Feb 15, 2023
974f149
rubocop fix
pengyin-shan Feb 15, 2023
f17e032
add linux support
pengyin-shan Feb 16, 2023
6035da1
change back to lagoan/translation_io_rails after validing fixes in st…
pengyin-shan Feb 16, 2023
68f6155
Merge pull request #318 from portagenetwork/issue314
pengyin-shan Feb 16, 2023
83c3fef
update CHANGELOG for final release
pengyin-shan Feb 17, 2023
ff64fed
fix some grammar issue in CHANGELOG
pengyin-shan Feb 17, 2023
a2de580
Merge pull request #271 from portagenetwork/3.1.0_rubocop_only
pengyin-shan Feb 21, 2023
ba2c046
add setup-node action to Github workflow to force node using v16
pengyin-shan Feb 21, 2023
9289419
following main codebase suggestion on PR3292 to exclude lib tasks fro…
pengyin-shan Feb 21, 2023
fe11c0c
update Changelog
pengyin-shan Feb 21, 2023
994d94f
Merge pull request #320 from portagenetwork/3.1.0-formal
pengyin-shan Feb 21, 2023
1a0b9e3
add v16 to github actions of Ruby and ESLint
pengyin-shan Feb 21, 2023
14e4300
Merge pull request #322 from portagenetwork/3.1.0-formal
portagenetwork Feb 21, 2023
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
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -213,6 +213,8 @@ gem 'httparty'
# Autoload dotenv in Rails. (https://github.com/bkeepers/dotenv)
gem 'dotenv-rails'

gem 'activerecord_json_validator'

# ================================= #
# ENVIRONMENT SPECIFIC DEPENDENCIES #
# ================================= #
13 changes: 13 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -33,6 +33,9 @@ GEM
activemodel (= 5.2.7)
activesupport (= 5.2.7)
arel (>= 9.0)
activerecord_json_validator (2.1.0)
activerecord (>= 4.2.0, < 8)
json_schemer (~> 0.2.18)
activestorage (5.2.7)
actionpack (= 5.2.7)
activerecord (= 5.2.7)
@@ -130,6 +133,8 @@ GEM
dragonfly-s3_data_store (1.3.0)
dragonfly (~> 1.0)
fog-aws
ecma-re-validator (0.4.0)
regexp_parser (~> 2.2)
erubi (1.10.0)
excon (0.92.2)
execjs (2.8.1)
@@ -188,6 +193,7 @@ GEM
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
hana (1.3.7)
hashdiff (1.0.1)
hashie (5.0.0)
highline (2.0.3)
@@ -204,6 +210,11 @@ GEM
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
json (2.6.1)
json_schemer (0.2.20)
ecma-re-validator (~> 0.3)
hana (~> 1.3)
regexp_parser (~> 2.0)
uri_template (~> 0.7)
jwt (2.3.0)
kaminari (1.2.2)
activesupport (>= 4.1.0)
@@ -450,6 +461,7 @@ GEM
thread_safe (~> 0.1)
unicode-display_width (2.1.0)
uniform_notifier (1.16.0)
uri_template (0.7.0)
warden (1.2.9)
rack (>= 2.0.9)
web-console (3.7.0)
@@ -490,6 +502,7 @@ PLATFORMS
x86_64-darwin-19

DEPENDENCIES
activerecord_json_validator
annotate
annotate_gem
api-pagination
75 changes: 75 additions & 0 deletions app/assets/stylesheets/blocks/_modal_search.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
.modal-search-block {
border: 1px solid $color-grey;
margin-bottom: 10px;
padding: 10px 5px;
}

.modal-search .modal-dialog {
/* Make the dialog 80% of the screen height/width */
width: 80%;
// height: 80%;
}
.modal-search .modal-body {
/* 100% = dialog height, 50px = header (27.5px) + footer (21px) */
// max-height: calc(80% - 50px);
max-height: 450px;
overflow-y: scroll;
}

.modal-search-results-pagination {
margin-bottom: 10px;
}

.modal-search-result {
margin-top: 5px;
padding-bottom: 5px;

.modal-search-result-label {
font-size: 1.6rem;
font-weight: 500;
}

.tags > .tag {
display: inline-block;
margin: 5px 2px;
}
.tags .facet {
border: 1px solid $color-blue;
border-radius: 25px;
padding: 2px 5px;
}

div {
margin-bottom: 5px;
}

dl {
margin-left: 20px;

dd {
margin-bottom: 5px;
}
}
}

.modal-search-results .modal-search-result {
border-bottom: 1px solid $color-grey;
}

/* the 'Select' button displayed in the modal dialog */
.modal-search-result .modal-search-result-selector,
.modal-search-result .modal-search-result-unselector {
display: inline-block;
background-color: $color-white;
border-radius: 25px;
padding: 2px 5px;
font-size: 1.3rem;
}
.modal-search-result .modal-search-result-selector {
background-color: $color-green;
color: $color-white;
}
.modal-search-result .modal-search-result-unselector {
border: 1px solid $color-red;
color: $color-red;
}
1 change: 1 addition & 0 deletions app/assets/stylesheets/variables/_colours.scss
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
$color-black: #000;
$color-white: #FFF;
$color-red: #b94a48;
$color-green: #4c8d3f;
$color-grey: #4F5253;
$color-grey-darkest: #222;
$color-grey-darker: #333;
15 changes: 10 additions & 5 deletions app/controllers/plan_exports_controller.rb
Original file line number Diff line number Diff line change
@@ -6,7 +6,8 @@ class PlanExportsController < ApplicationController

include ConditionsHelper

# rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
# rubocop:disable Metrics/AbcSize, Metrics/MethodLength
# rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
def show
@plan = Plan.includes(:answers, { template: { phases: { sections: :questions } } })
.find(params[:plan_id])
@@ -17,6 +18,7 @@ def show
@show_sections_questions = export_params[:question_headings].present?
@show_unanswered = export_params[:unanswered_questions].present?
@show_custom_sections = export_params[:custom_sections].present?
@show_research_outputs = export_params[:research_outputs].present?
@public_plan = false

elsif publicly_authorized?
@@ -25,6 +27,7 @@ def show
@show_sections_questions = true
@show_unanswered = true
@show_custom_sections = true
@show_research_outputs = @plan.research_outputs&.any? || false
@public_plan = true

else
@@ -49,7 +52,8 @@ def show
format.json { show_json }
end
end
# rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
# rubocop:enable Metrics/AbcSize, Metrics/MethodLength
# rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity

private

@@ -124,8 +128,9 @@ def privately_authorized?
end

def export_params
params.require(:export).permit(:form, :project_details, :question_headings,
:unanswered_questions, :custom_sections,
:formatting)
params.require(:export)
.permit(:form, :project_details, :question_headings, :unanswered_questions,
:custom_sections, :research_outputs,
formatting: [:font_face, :font_size, { margin: %i[top right bottom left] }])
end
end
28 changes: 1 addition & 27 deletions app/controllers/plans_controller.rb
Original file line number Diff line number Diff line change
@@ -270,9 +270,7 @@ def update
funder_attrs[:org_id] = plan_params[:funder][:id]
funder = org_from_params(params_in: funder_attrs)
@plan.funder_id = funder&.id
attrs.delete(:funder)

process_grant(grant_params: plan_params[:grant])
@plan.grant = plan_params[:grant]
attrs.delete(:grant)
attrs = remove_org_selection_params(params_in: attrs)

@@ -537,29 +535,5 @@ def render_phases_edit(plan, phase, guidance_groups)
guidance_presenter: GuidancePresenter.new(plan)
})
end

# Update, destroy or add the grant
# rubocop:disable Metrics/AbcSize
# rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
def process_grant(grant_params:)
return false unless grant_params.present?

grant = @plan.grant

# delete it if it has been blanked out
if grant_params[:value].blank? && grant.present?
grant.destroy
@plan.grant = nil
elsif grant_params[:value] != grant&.value
if grant.present?
grant.update(value: grant_params[:value])
elsif grant_params[:value].present?
@plan.grant = Identifier.new(identifier_scheme: nil, identifiable: @plan,
value: grant_params[:value])
end
end
end
# rubocop:enable Metrics/AbcSize
# rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
end
# rubocop:enable Metrics/ClassLength
Loading