Merge pull request #1370 from sparc-request/fix-save-as-draft-edit-ssr

Fix Save as Draft bug when editing a SSR [#151738929 ]
sparc-request · Jun 15, 2018 · 2bad293 · 2bad293
2 parents 7c29aad + 6e2fe54
commit 2bad293
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/service_requests/modals/_save_as_draft_modal.html.haml b/app/views/service_requests/modals/_save_as_draft_modal.html.haml
@@ -31,6 +31,6 @@
           = t(:proper)[:navigation][:save_as_draft][:body]
       .modal-footer
         .center-block
-          = link_to t(:constants)[:yes_select], save_and_exit_service_request_path, class: 'btn btn-default yes-button', data: { disable_with: t(:proper)[:navigation][:bottom][:saving] }
+          = link_to t(:constants)[:yes_select], save_and_exit_service_request_path(sub_service_request_id: sub_service_request_id), class: 'btn btn-default yes-button', data: { disable_with: t(:proper)[:navigation][:bottom][:saving] }
           %button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } }
             = t(:constants)[:no_select]
diff --git a/app/views/service_requests/save_and_exit.js.coffee b/app/views/service_requests/save_and_exit.js.coffee
@@ -17,5 +17,5 @@
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # 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.
-$("#modal_place").html("<%= escape_javascript(render( 'service_requests/modals/save_as_draft_modal' )) %>")
+$("#modal_place").html("<%= escape_javascript(render( 'service_requests/modals/save_as_draft_modal', sub_service_request_id: @sub_service_request.try(:id) )) %>")
 $("#modal_place").modal 'show'