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.

Sign up for GitHub

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

Jump to bottom

View Consolidated Request button Not working [#136963065] #852

Merged
merged 1 commit into from
Jan 3, 2017
Merged

View Consolidated Request button Not working [#136963065] #852

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/controllers/service_calendars_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,11 @@ def authorize_dashboard_access
end

def authorize_protocol
@protocol = Arm.find(params[:arm_id]).protocol
@protocol = if params[:protocol_id]
Protocol.find(params[:protocol_id])
else
Arm.find(params[:arm_id]).protocol
end
permission_to_view = @protocol.project_roles.where(identity_id: current_user.id, project_rights: ['approve', 'request']).any?

unless permission_to_view || Protocol.for_admin(current_user.id).include?(@protocol)
Expand Down