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

Merge Development for v3.0.5 #3108

Merged
merged 73 commits into from
Feb 14, 2022
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
494931c
updated PDF coversheet to always show the creator of the DMP
briri Oct 7, 2021
c86ad2b
Merge branch 'development' into pdf-coversheet-fix
johnpinto1 Oct 25, 2021
66b4866
minor fix for issue generating PDF when no options were specified
briri Oct 26, 2021
2d3fc80
Issue #2941 - Make the display of the phome number in the Plan
Nov 17, 2021
db783fc
Issue#dcc2983 - Fix for preventing adding a Contributor via Contributor
Nov 23, 2021
2c00cde
Issue#3069 - (DCC Issue 675) - Org Admin and Super Admin searches and
Dec 23, 2021
1173d60
Bug DCC Issues 592, 645 - Fix for Org Admins seeing deleted Plans for…
Jan 11, 2022
b2cded7
Issue DCC-674: Fix for broken CSV Download noticed because a nil
Jan 10, 2022
d5144d9
DCC Issue 679 - Fix for issue that Super Admins unable to create new
Jan 13, 2022
1512944
TEMP CHANGE FOR DCC 453 BUG
Jan 18, 2022
8df635f
DCC bug 453 - Unlike in previous version of the DMP Roadmap a API use…
Jan 19, 2022
b2eff34
DCC Bug 668 - Fix for issue of roles in a plan that does not have a
Jan 20, 2022
0ddec3d
updated PDF coversheet to always show the creator of the DMP
briri Oct 7, 2021
22c1d16
Merge branch 'pdf-coversheet-fix' of github.com:DMPRoadmap/roadmap in…
raycarrick-ed Jan 27, 2022
a4407e8
Merge pull request #3049 from DMPRoadmap/pdf-coversheet-fix
raycarrick-ed Jan 27, 2022
c9b2f8f
minor fix for issue generating PDF when no options were specified
briri Oct 26, 2021
3289408
Merge branch 'minor-bugs' of github.com:DMPRoadmap/roadmap into minor…
raycarrick-ed Jan 28, 2022
53012c3
update Gemfile.lock
raycarrick-ed Jan 31, 2022
816f127
updated PDF coversheet to always show the creator of the DMP
briri Oct 7, 2021
016701e
Merge branch 'development' of github.com:DMPRoadmap/roadmap into deve…
raycarrick-ed Jan 31, 2022
839cf31
Merge pull request #3101 from DMPRoadmap/update_dev
raycarrick-ed Jan 31, 2022
6adaf46
DCC Bug 668 - Fix for issue of roles in a plan that does not have a
Jan 20, 2022
476f00a
Merge branch 'bug_dcc_668-admin_not_able_to_see_plans' of github.com:…
raycarrick-ed Jan 31, 2022
fd2a453
Merge pull request #3095 from DMPRoadmap/bug_dcc_668-admin_not_able_t…
raycarrick-ed Jan 31, 2022
98b941b
TEMP CHANGE FOR DCC 453 BUG
Jan 18, 2022
5235099
DCC bug 453 - Unlike in previous version of the DMP Roadmap a API use…
Jan 19, 2022
f4ef640
Merge branch 'bug_dcc-453_api_not_providing_owner_email_anymore' of g…
raycarrick-ed Jan 31, 2022
147ea32
rubocop fixes
raycarrick-ed Jan 31, 2022
118ca72
Merge pull request #3094 from DMPRoadmap/bug_dcc-453_api_not_providin…
raycarrick-ed Jan 31, 2022
e7f7a10
Merge branch 'development' into minor-bugs
briri Jan 31, 2022
aa63017
Merge pull request #3054 from DMPRoadmap/minor-bugs
briri Jan 31, 2022
41a2791
Merge branch 'development' into Bug_2941-make-DMP-contributors-phone-…
briri Jan 31, 2022
7bca37c
Merge pull request #3067 from DMPRoadmap/Bug_2941-make-DMP-contributo…
briri Jan 31, 2022
7eb7398
Merge branch 'development' into bug_DCC2983-possible_to_add_contribut…
briri Jan 31, 2022
412868d
Merge branch 'development' into bug_dcc_592_and_645_deleted-private_p…
briri Jan 31, 2022
aa56797
Merge branch 'development' into bug-dcc-679-super-admins-unable-to-ad…
briri Jan 31, 2022
b419b18
DCC Issue 679 - Fix for issue that Super Admins unable to create new
Jan 13, 2022
fc6fcaa
Merge branch 'bug-dcc-679-super-admins-unable-to-add-new-organisation…
raycarrick-ed Feb 1, 2022
7e0f2e2
debugging
raycarrick-ed Feb 1, 2022
ce35995
undo debug - now working
raycarrick-ed Feb 1, 2022
60a88be
debugging failure
raycarrick-ed Feb 1, 2022
1be3a60
once more to debug
raycarrick-ed Feb 1, 2022
e2c4914
Remove prg has to have abbrev test
raycarrick-ed Feb 1, 2022
a053f9f
Merge pull request #3091 from DMPRoadmap/bug-dcc-679-super-admins-una…
raycarrick-ed Feb 1, 2022
1edafec
Bug DCC Issues 592, 645 - Fix for Org Admins seeing deleted Plans for…
Jan 11, 2022
a499b25
Merge branch 'bug_dcc_592_and_645_deleted-private_plans_visible_to_or…
raycarrick-ed Feb 1, 2022
7d9bd57
needs active role for org_admin_plans to work
raycarrick-ed Feb 1, 2022
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
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
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
Prev Previous commit
Next Next commit
rubocop clean up
raycarrick-ed committed Feb 2, 2022
commit fb19b910ae5aa0ff3c42b88e942bf80513e4ebeb
8 changes: 3 additions & 5 deletions app/controllers/paginable/plans_controller.rb
Original file line number Diff line number Diff line change
@@ -62,14 +62,12 @@ def org_admin
def index
@user = User.find(params[:id])
authorize @user
unless current_user.present? && current_user.can_org_admin? && @user.present?
raise Pundit::NotAuthorizedError
end
raise Pundit::NotAuthorizedError unless current_user.present? && current_user.can_org_admin? && @user.present?

paginable_renderise(
partial: "index",
partial: 'index',
scope: Plan.active(@user),
query_params: { sort_field: "plans.updated_at", sort_direction: :desc },
query_params: { sort_field: 'plans.updated_at', sort_direction: :desc },
format: :json
)
end