Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Save as Draft bug when editing a SSR [#151738929 ] #1370

Merged
merged 2 commits into from
Jun 15, 2018
Merged

Fix Save as Draft bug when editing a SSR [#151738929 ] #1370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ea2d2e
missing parama
ying-pbrc Jun 12, 2018
6e2fe54
Merge branch 'v3.3.0' into fix-save-as-draft-edit-ssr
ying-pbrc Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/service_requests/modals/_save_as_draft_modal.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion app/views/service_requests/save_and_exit.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'