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

Other methods in ServiceCalendarsController needed @service_request initialized. [#136963065]
sparc-request · Jan 4, 2017 · 8be629e · 8be629e
2 parents 8e8ed2d + 5c1aa6b
commit 8be629e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/controllers/service_calendars_controller.rb b/app/controllers/service_calendars_controller.rb
@@ -195,6 +195,9 @@ def authorize_dashboard_access
     if params[:sub_service_request_id]
       authorize_admin
     else
+      if params[:service_request_id]
+        @service_request = ServiceRequest.find(params[:service_request_id])
+      end
       authorize_protocol
     end
   end

diff --git a/app/views/dashboard/sub_service_requests/_per_patient_per_visit.html.haml b/app/views/dashboard/sub_service_requests/_per_patient_per_visit.html.haml
@@ -27,11 +27,11 @@
       .schedule-tabs{ role: 'tabpanel' }
         %ul.nav.nav-tabs.nav-justified{ role: 'tablist' }
           %li.other_tab.custom-tab.ss_tab{ role: 'presentation', class: cookies['admin-ss-tab'] ? (cookies['admin-ss-tab'] == 'template_tab' ? 'active' : '') : 'active' }
-            = link_to t(:calendars)[:tabs][:template], '#template-calendar', id: 'template_tab', data: { toggle: 'tab', url: table_service_calendars_path(sub_service_request_id: sub_service_request.id, tab: 'template', review: false, portal: true) }, role: 'tab', 'aria-controls' => 'template-calendar', target: '#template-calendar'
+            = link_to t(:calendars)[:tabs][:template], '#template-calendar', id: 'template_tab', data: { toggle: 'tab', url: table_service_calendars_path(service_request_id: service_request.id, sub_service_request_id: sub_service_request.id, tab: 'template', review: false, portal: true) }, role: 'tab', 'aria-controls' => 'template-calendar', target: '#template-calendar'
           %li.other_tab.custom-tab.ss_tab{ role: 'presentation', class: cookies['admin-ss-tab'] == 'billing_strategy_tab' ? 'active' : '' }
-            = link_to t(:calendars)[:tabs][:billing], '#billing-strategy-calendar', id: 'billing_strategy_tab', data: { toggle: 'tab', url: table_service_calendars_path(sub_service_request_id: sub_service_request.id, tab: 'billing_strategy', review: false, portal: true) }, role: 'tab', 'aria-controls' => 'billing-strategy-calendar', target: '#billing-strategy-calendar'
+            = link_to t(:calendars)[:tabs][:billing], '#billing-strategy-calendar', id: 'billing_strategy_tab', data: { toggle: 'tab', url: table_service_calendars_path(service_request_id: service_request.id, sub_service_request_id: sub_service_request.id, tab: 'billing_strategy', review: false, portal: true) }, role: 'tab', 'aria-controls' => 'billing-strategy-calendar', target: '#billing-strategy-calendar'
           %li.pricing_tab.custom-tab.ss_tab{ role: 'presentation', class: cookies['admin-ss-tab'] == 'calendar_tab' ? 'active' : '' }
-            = link_to t(:calendars)[:tabs][:pricing], '#consolidated-request-calendar', id: 'calendar_tab', data: { toggle: 'tab', url: merged_calendar_service_calendars_path(sub_service_request_id: sub_service_request.id, tab: 'calendar', review: false, portal: true) }, role: 'tab', 'aria-controls' => 'consolidated-request-calendar', target: '#consolidated-request-calendar'
+            = link_to t(:calendars)[:tabs][:pricing], '#consolidated-request-calendar', id: 'calendar_tab', data: { toggle: 'tab', url: merged_calendar_service_calendars_path(service_request_id: service_request.id, sub_service_request_id: sub_service_request.id, tab: 'calendar', review: false, portal: true) }, role: 'tab', 'aria-controls' => 'consolidated-request-calendar', target: '#consolidated-request-calendar'
           .move-visits
       .tab-content
         .tab-pane#template-calendar{ role: 'tabpanel', class: cookies['admin-ss-tab'] ? (cookies['admin-ss-tab'] == 'template_tab' ? 'active' : '') : 'active' }