Sj cart ssr bug

app/controllers/protocols_controller.rb

@@ -73,6 +73,7 @@ def create
   def edit
     @protocol_type                          = @protocol.type
     @service_request                        = ServiceRequest.find(params[:srid])
+    @sub_service_request                    = SubServiceRequest.find(params[:sub_service_request_id]) if params[:sub_service_request_id]
     @in_dashboard                           = false
     @protocol.populate_for_edit
     @protocol.valid?
@@ -96,6 +97,7 @@ def update
 
     attrs            = fix_date_params
     @service_request = ServiceRequest.find(params[:srid])
+    @sub_service_request = SubServiceRequest.find(params[:sub_service_request_id]) if params[:sub_service_request_id]
 
     if @protocol.update_attributes(attrs.merge(study_type_question_group_id: StudyTypeQuestionGroup.active_id))
 

app/views/protocols/_summary.html.haml

@@ -25,7 +25,7 @@
       %button.btn.btn-info.view-protocol-details-button{ data: { protocol_id: protocol.id } }
         = I18n.t('protocols.view_details.button', protocol_type: protocol_type)
       - if allow_edit
-        = link_to I18n.t('protocols.edit', protocol_type: protocol_type), edit_protocol_path(protocol, srid: service_request.id), class: 'btn btn-warning edit-protocol-information-button'
+        = link_to I18n.t('protocols.edit', protocol_type: protocol_type), edit_protocol_path(protocol, srid: service_request.id, sub_service_request_id: sub_service_request_id), class: 'btn btn-warning edit-protocol-information-button'
     .clearfix
   .panel-body#protocol-summary.text-left
     - if RESEARCH_MASTER_ENABLED && protocol.is_study?

app/views/protocols/edit.html.haml

@@ -24,4 +24,4 @@
     = render 'shared/modal_errors', errors: @errors
 #protocol
   = render 'protocols/form/edit_protocol_type', protocol: @protocol, protocol_type: @protocol_type, service_request: @service_request, in_dashboard: @in_dashboard
-  = render 'protocols/form/protocol_form', protocol: @protocol, protocol_type: @protocol_type, service_request: @service_request
+  = render 'protocols/form/protocol_form', protocol: @protocol, protocol_type: @protocol_type, service_request: @service_request, sub_service_request_id: @sub_service_request.try(:id)

app/views/protocols/form/_protocol_form.html.haml

@@ -24,6 +24,8 @@
     -# TODO rename :srid to :service_request_id in controller action
     = hidden_field_tag :service_request_id, service_request.id
     = hidden_field_tag :srid, service_request.id
+    - if @sub_service_request
+      = hidden_field_tag :sub_service_request_id, @sub_service_request.id
     = form.hidden_field :requester_id
     = form.hidden_field :type
     - if protocol.type.capitalize == "Study"
@@ -43,5 +45,8 @@
       .col-lg-4
       .col-lg-4.text-center
         %input.btn.btn-lg.btn-success{ type: "submit", value: t(:actions)[:save] }
-        = link_to t(:actions)[:cancel], protocol_service_request_path(service_request), class: 'btn btn-lg btn-danger'
+        - if @sub_service_request
+          = link_to t(:actions)[:cancel], protocol_service_request_path(service_request, sub_service_request_id: @sub_service_request.id), class: 'btn btn-lg btn-danger'
+        - else
+          = link_to t(:actions)[:cancel], protocol_service_request_path(service_request), class: 'btn btn-lg btn-danger'
       .col-lg-4

app/views/protocols/update.js.coffee

@@ -18,7 +18,11 @@
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <% unless @errors %>
+<% if @sub_service_request %>
+window.location = "<%= protocol_service_request_path(@service_request, sub_service_request_id: @sub_service_request.id) %>"
+<% else %>
 window.location = "<%= protocol_service_request_path(@service_request) %>"
+<% end %>
 <% else %>
 $("#flashes_container").html("<%= escape_javascript(render( 'shared/modal_errors', errors: @errors )) %>")
 $('#body').scrollTop(0)

app/views/service_requests/navigation/_footer.html.haml

@@ -19,7 +19,7 @@
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .bottom-nav.col-sm-12.ui-corner-all{ class: css_class }
   .col-sm-3.text-left
-    = link_to t(:proper)[:navigation][:bottom][:back], back, class: 'btn btn-default'
+    = link_to t(:proper)[:navigation][:bottom][:back], sub_service_request_id ? "#{back}?sub_service_request_id=#{sub_service_request_id}" : back, class: 'btn btn-default'
   - if controller.action_name == 'review'
     .col-sm-3.text-center
       = save_as_draft_button(sub_service_request_id)
@@ -35,7 +35,7 @@
   - if SYSTEM_SATISFACTION_SURVEY && action_name == 'review'
     .col-sm-3.text-right
       = link_to t(:proper)[:navigation][:bottom][:submit],
-      confirmation_service_request_path(service_request, sub_service_request_id: sub_service_request_id), 
+      confirmation_service_request_path(service_request, sub_service_request_id: sub_service_request_id),
       class: 'btn btn-default form-submit-button'
   - else
     .col-sm-3.text-right

app/views/service_requests/protocol/_protocol_display.html.haml

@@ -24,7 +24,7 @@
         = t(:proper)[:protocol][:review_protocol_notice]
         %small
           = t(:proper)[:protocol][:review_protocol_instructions]
-    = render 'protocols/summary', protocol: protocol, protocol_type: protocol.type, service_request: service_request, allow_edit: true
+    = render 'protocols/summary', protocol: protocol, protocol_type: protocol.type, service_request: service_request, sub_service_request_id: sub_service_request_id, allow_edit: true
     = render 'associated_users/table', protocol: protocol, service_request: service_request
   - else
     .page-header

app/views/service_requests/protocol/_protocol_left.html.haml

@@ -19,4 +19,4 @@
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .col-md-9.protocol-left
   = render 'service_requests/protocol/service_list', service_request: @service_request, sub_service_request: @sub_service_request
-  = render 'service_requests/protocol/protocol_display', service_request: @service_request, protocol: @service_request.protocol
+  = render 'service_requests/protocol/protocol_display', service_request: @service_request, sub_service_request_id: @sub_service_request.try(:id), protocol: @service_request.protocol