Merge pull request #852 from sparc-request/jjh-report-export

View Consolidated Request button Not working [#136963065]
sparc-request · Jan 3, 2017 · 42bfd66 · 42bfd66
2 parents 455bc54 + 9e23f64
commit 42bfd66
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/controllers/service_calendars_controller.rb b/app/controllers/service_calendars_controller.rb
@@ -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)