Referenced in DCC Bug 698 - The School departments functionality broken. - #3155
Merged
Merged
Conversation
Referenced in a comment in DCC bug 698 https://github.com/DigitalCurationCentre/DMPonline-Service/issues/698#issuecomment-1096577463 Fix involved following change: - in app/policies/department_policy the index?() policy method reference @department (which does not exist). Even changing @department to @record fails as @record is the Department class (not an instance of Department). Inspect of @record in index?() shows "Department(id: integer, name: string, code: string, org_id: integer, created_at: datetime, updated_at: datetime)". So replaced (@user.can_org_admin? && @user.org.id == @department.org_id) || @user.can_super_admin? by @user.can_org_admin? || @user.can_super_admin? as @department is nil and @record.org_id id not defined for a Class object Department.
briri
approved these changes
Apr 13, 2022
briri
left a comment
briri
left a comment
Contributor
There was a problem hiding this comment.
Makes sense @johnpinto1. Thanks!
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Referenced in a comment in DCC bug 698 https://github.com/DigitalCurationCentre/DMPonline-Service/issues/698#issuecomment-1096577463
Fix involved following change:
reference @department (which does not exist). Even changing @department
to @record fails as @record is the Department class (not an instance of
Department). Inspect of @record in index?() shows
"Department(id: integer, name: string, code: string, org_id: integer,
created_at: datetime, updated_at: datetime)".
So replaced
(@user.can_org_admin? && @user.org.id == @department.org_id) ||
@user.can_super_admin?
by @user.can_org_admin? || @user.can_super_admin?
as @department is nil and @record.org_id id not defined for a Class
object Department.
This fixes issue. But to see results you will need to change
which I have done
config.x.application.api_max_page_size = 10
"View all" shows
Reverting back to with
config.x.application.api_max_page_size = 100
you see the same set of Departments for "View less" and "View all"