Fix SSR edit thru portal. [#128093087]

app/controllers/service_requests_controller.rb

@@ -68,7 +68,8 @@ def navigate
     if @errors.any?
       render action: @page
     else
-      redirect_to "/service_requests/#{@service_request.id}/#{@forward}"
+      ssr_id_params = @sub_service_request ? "?sub_service_request_id=#{@sub_service_request.id}" : ""
+      redirect_to "/service_requests/#{@service_request.id}/#{@forward}" + ssr_id_params
     end
   end
 
@@ -144,7 +145,8 @@ def service_subsidy
     end
 
     if !@has_subsidy && !@eligible_for_subsidy
-      redirect_to "/service_requests/#{@service_request.id}/document_management"
+      ssr_id_params = @sub_service_request ? "?sub_service_request_id=#{@sub_service_request.id}" : ""
+      redirect_to "/service_requests/#{@service_request.id}/document_management" + ssr_id_params
     end
   end
 
@@ -246,7 +248,7 @@ def save_and_exit
           update_service_request_status(@service_request, 'draft', false)
           @service_request.ensure_ssr_ids
         end
-        redirect_to dashboard_root_path
+        redirect_to dashboard_root_path, sub_service_request_id: @sub_service_request.try(:id)
       }
       format.js
     end
@@ -383,7 +385,7 @@ def validate_catalog
       @service_request.errors.full_messages.each do |m|
         flash[:error] = m
       end
-      redirect_to catalog_service_request_path(@service_request) and return false
+      redirect_to catalog_service_request_path(@service_request, sub_service_request_id: @sub_service_request.try(:id)) and return false
     end
     return true
   end
@@ -393,7 +395,7 @@ def validate_protocol
       @service_request.errors.full_messages.each do |m|
         flash[:error] = m
       end
-      redirect_to protocol_service_request_path(@service_request) and return false
+      redirect_to protocol_service_request_path(@service_request, sub_service_request_id: @sub_service_request.try(:id)) and return false
     end
     return true
   end
@@ -403,7 +405,7 @@ def validate_service_details
       @service_request.errors.full_messages.each do |m|
         flash[:error] = m
       end
-      redirect_to service_details_service_request_path(@service_request) and return false
+      redirect_to service_details_service_request_path(@service_request, sub_service_request_id: @sub_service_request.try(:id)) and return false
     end
     return true
   end
@@ -413,7 +415,7 @@ def validate_service_calendar
       @service_request.errors.full_messages.each do |m|
         flash[:error] = m
       end
-      redirect_to service_calendar_service_request_path(@service_request) and return false
+      redirect_to service_calendar_service_request_path(@service_request, sub_service_request_id: @sub_service_request.try(:id)) and return false
     end
     return true
   end

app/views/catalogs/_catalog_right.html.haml

@@ -21,5 +21,5 @@
   .shopping-cart
     = render 'service_requests/right_navigation/cart', service_request: service_request, sub_service_request: sub_service_request, sub_service_requests: sub_service_requests, line_items_count: line_items_count, allow_delete: true
   .nav-buttons
-    = link_to t(:actions)[:continue], protocol_service_request_path(service_request), class: 'submit-request-button btn btn-success btn-lg btn-block'
+    = link_to t(:actions)[:continue], protocol_service_request_path(service_request, sub_service_request_id: sub_service_request.try(:id)), class: 'submit-request-button btn btn-success btn-lg btn-block'
     = render 'service_requests/right_navigation/right_navigation'

app/views/service_requests/document_management.html.haml

@@ -26,6 +26,8 @@
 = render '/service_requests/navigation/steps', service_request: @service_request, step: @step_text, css_class: @css_class
 .col-sm-12.body-container#documents-page
   = form_tag navigate_service_request_path(@service_request), id: 'service-request-form' do
+    - if @sub_service_request
+      = hidden_field_tag :sub_service_request_id, @sub_service_request.id
     = render 'service_requests/document_management/document_management_left', service_request: @service_request
     = render 'service_requests/document_management/document_management_right', service_request: @service_request, sub_service_request: @sub_service_request, sub_service_requests: @sub_service_requests, line_items_count: @line_items_count
 = render 'service_requests/navigation/footer', service_request: @service_request, css_class: @css_class, back: @back, forward: @forward

app/views/service_requests/protocol.html.haml

@@ -23,6 +23,8 @@
 = render 'service_requests/modals/request_submitted_modal', service_request: @service_request
 .col-sm-12.body-container#protocols-page
   = form_tag navigate_service_request_path(@service_request), id: 'service-request-form' do
+    - if @sub_service_request
+      = hidden_field_tag :sub_service_request_id, @sub_service_request.id
     = render 'shared/modal_errors', errors: @errors
     = render 'service_requests/protocol/protocol_left', service_request: @service_request, sub_service_request: @sub_service_request
     = render 'service_requests/protocol/protocol_right', service_request: @service_request, sub_service_request: @sub_service_request, sub_service_requests: @sub_service_requests, line_items_count: @line_items_count

app/views/service_requests/review.html.haml

@@ -22,6 +22,8 @@
 = render 'service_requests/navigation/steps', service_request: @service_request, step: @step_text, css_class: @css_class
 .col-sm-12.body-container#review-page
   = form_tag navigate_service_request_path(@service_request), id: 'service-request-form' do
+    - if @sub_service_request
+      = hidden_field_tag :sub_service_request_id, @sub_service_request.id
     = render 'service_requests/review/instructions'
     = render 'service_requests/review/protocol_information', service_request: @service_request, protocol: @service_request.protocol
     = render 'service_requests/review/authorized_users', service_request: @service_request, protocol: @service_request.protocol

app/views/service_requests/service_calendar.html.haml

@@ -22,6 +22,8 @@
 = render '/service_requests/navigation/steps', service_request: @service_request, step: @step_text, css_class: @css_class
 .col-sm-12.body-container
   = form_tag navigate_service_request_path(@service_request), id: 'service-request-form' do
+    - if @sub_service_request
+      = hidden_field_tag :sub_service_request_id, @sub_service_request.id
     = render 'shared/modal_errors', errors: @errors
     %p.pricing-message
       = t(:proper)[:catalog][:center][:pricing_warning]

app/views/service_requests/service_details.html.haml

@@ -23,6 +23,8 @@
 = render 'service_requests/modals/request_submitted_modal', service_request: @service_request
 .col-sm-12.body-container#service-details-page
   = form_tag navigate_service_request_path(@service_request), id: 'service-request-form' do
+    - if @sub_service_request
+      = hidden_field_tag :sub_service_request_id, @sub_service_request.id
     = render 'shared/modal_errors', errors: @errors
     = render 'service_requests/service_details/service_details_left', service_request: @service_request, sub_service_request: @sub_service_request, protocol: @service_request.protocol
     = render 'service_requests/service_details/service_details_right', service_request: @service_request, sub_service_request: @sub_service_request, sub_service_requests: @sub_service_requests, line_items_count: @line_items_count

app/views/service_requests/service_subsidy.html.haml

@@ -22,6 +22,8 @@
 = render '/service_requests/navigation/steps', service_request: @service_request, step: @step_text, css_class: @css_class
 .col-sm-12.body-container#service-subsidy-page
   = form_tag navigate_service_request_path(@service_request), id: 'service-request-form', class: 'form-horizontal' do
+    - if @sub_service_request
+      = hidden_field_tag :sub_service_request_id, @sub_service_request.id
     = render 'service_requests/service_subsidy/service_subsidy_left', service_request: @service_request, has_subsidy: @has_subsidy, eligible_for_subsidy: @eligible_for_subsidy
     = render 'service_requests/service_subsidy/service_subsidy_right', service_request: @service_request, sub_service_request: @sub_service_request, sub_service_requests: @sub_service_requests, line_items_count: @line_items_count
 = render 'service_requests/navigation/footer', service_request: @service_request, css_class: @css_class, back: @back, forward: @forward