Skip to content

Commit

Permalink
Merge pull request #1179 from sparc-request/jm_duplicate_study_types
Browse files Browse the repository at this point in the history
JM- (SPARCRequest & SPARCDashboard) Duplicate Study Types found in Pr…
  • Loading branch information
Stuart-Johnson committed Nov 17, 2017
2 parents 9a5bc51 + be6abaf commit b7b1871
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@
.row#actions
.col-lg-4
.col-lg-4.text-center
%input.btn.btn-lg.btn-success{ type: "submit", value: t(:actions)[:save] }
%input.btn.btn-lg.btn-success{ type: "submit", value: t(:actions)[:save], data: { disable_with: t(:dashboard)[:navigation][:bottom][:saving]} }
= link_to t(:actions)[:cancel], protocol.id.present? ? dashboard_protocol_path(protocol) : Setting.find_by_key("dashboard_link").value, class: 'btn btn-lg btn-danger'
.col-lg-4
2 changes: 1 addition & 1 deletion app/views/protocols/form/_protocol_form.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
.row#actions
.col-lg-4
.col-lg-4.text-center
%input.btn.btn-lg.btn-success{ type: "submit", value: t(:actions)[:save] }
%input.btn.btn-lg.btn-success{ type: "submit", value: t(:actions)[:save], data: { disable_with: t(:proper)[:navigation][:bottom][:saving] } }
- 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
Expand Down
7 changes: 7 additions & 0 deletions config/locales/dashboard.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,13 @@ en:
epic_queue: "View or edit protocols for Epic interface"
messages: "Access to correspondence"

##############
# NAVIGATION #
##############
navigation:
bottom:
saving: "Saving..."

###########
# NOTES #
###########
Expand Down

0 comments on commit b7b1871

Please sign in to comment.