Skip to content

Commit

Permalink
Merge pull request #493 from timeoff-management/tom-xxx-prevent-doubl…
Browse files Browse the repository at this point in the history
…e-submission

Prevent double submission from browser
  • Loading branch information
vpp authored Sep 9, 2021
2 parents a711ad7 + a08b6aa commit df738ee
Show file tree
Hide file tree
Showing 28 changed files with 84 additions and 65 deletions.
66 changes: 33 additions & 33 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions public/js/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -274,3 +274,22 @@ $(document).ready(function() {

fetchNotifications();
});

/**
* Prevent for double submission.
*/
$(document).ready(function(){
$('.single-click').on('click', function(e) {
e.stopPropagation();

$(e.target).prop('disabled', true);
var form = $(e.target).closest('form');
var submitName = $(e.target).attr('name');
if (submitName !== undefined) {
$('<input>').attr({type: 'hidden', name: submitName, value: '1'}).appendTo(form);
}
form.submit();

return false;
});
});
2 changes: 1 addition & 1 deletion t/integration/department/one_by_one_crud.js
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ describe('CRUD for department secondary supervisers', function(){
});
});

it('Click on "Remove" button next to user C and observe that it disappeares from "secondary supervisors" section after page is reloaded', function(done){
it('Click on "Remove" button next to user C and observe that it disappears from "secondary supervisors" section after page is reloaded', function(done){
driver
.findElement(By.css(`button[name="remove_supervisor_id"][value="${ user_id_C }"]`))
.then(el => el.click())
Expand Down
2 changes: 1 addition & 1 deletion views/audit/emails.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</select>
</div>

<button type="submit" class="btn btn-info">Filter</button>
<button type="submit" class="btn btn-info single-click">Filter</button>
{{# if show_reset_button }}
<a href="/audit/email/" class="btn btn-default">Reset</a>
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion views/bankHolidays.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
{{!-- <button id="bankholiday-import-btn" class="btn btn-default" type="button">Import default holidays</button> --}}
<button class="btn btn-default" type="button" data-toggle="modal" data-target="#add_new_bank_holiday_modal" id="add_new_bank_holiday_btn">Add new</button>
{{#if bankHolidays.length}}
<button type="submit" class="btn btn-success">Save changes</button>
<button type="submit" class="btn btn-success single-click">Save changes</button>
{{/if}}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/department_details.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Department details
</div>
<div class="col-md-1 col-md-offset-8">
<button id="remove_btn" type="submit" class="pull-right btn btn-danger" data-toggle="tooltip" data-placement="top" title="Remove department"><i class="fa fa-trash"></i> Delete</button>
<button id="remove_btn" type="submit" class="pull-right btn btn-danger single-click" data-toggle="tooltip" data-placement="top" title="Remove department"><i class="fa fa-trash"></i> Delete</button>
</div>
</div>
</form>
Expand Down
2 changes: 1 addition & 1 deletion views/departments_bulk_update.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

<div class="row">
<div class="col-md-offset-9 col-md-3">
<button type="submit" class="btn btn-success pull-right">Save changes</button>
<button type="submit" class="btn btn-success pull-right single-click">Save changes</button>
<span class="pull-right">&nbsp;&nbsp;&nbsp;</span>
<a href='/settings/departments-bulk-update/' class="btn btn-link pull-right">Cancel</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/forgot_password.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<div class="form-group">
<div class="col-md-offset-4 col-md-2">
<button type="submit" class="btn btn-success" id="submit_login">Send instructions</button>
<button type="submit" class="btn btn-success single-click" id="submit_login">Send instructions</button>
</div>
</div>

Expand Down
8 changes: 4 additions & 4 deletions views/general_settings.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@

<div class="form-group">
<div class="col-md-offset-2 col-md-10">
<button type="submit" class="btn btn-success pull-right">Save changes</button>
<button type="submit" class="btn btn-success pull-right single-click">Save changes</button>
</div>
</div>
</form>
Expand Down Expand Up @@ -148,7 +148,7 @@
</div>
<div class="form-group">
<div class="col-md-offset-2 col-md-11">
<button type="submit" class="btn btn-success pull-right">Save schedule</button>
<button type="submit" class="btn btn-success pull-right single-click">Save schedule</button>
</div>
</div>
</form>
Expand All @@ -165,7 +165,7 @@
</div>
<div class="form-group">
<form class="col-md-offset-2 col-md-11" id="calculate_carry_over_form" method="post" action="/settings/carryOverUnusedAllowance">
<button class="btn btn-success pull-right" type="submit"><i class="fa fa-share"></i> Carry over allowance</button>
<button class="btn btn-success pull-right single-click" type="submit"><i class="fa fa-share"></i> Carry over allowance</button>
</form>
</div>
</div>
Expand Down Expand Up @@ -251,7 +251,7 @@
<div class="col-md-12">
<div class="pull-right">
<button class="btn btn-default" data-toggle="modal" data-target="#add_new_leave_type_modal" type="button" id="add_new_leave_type_btn">Add new</button>
<button type="submit" class="btn btn-success">Save changes</button>
<button type="submit" class="btn btn-success single-click">Save changes</button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/login.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<div class="form-group">
<div class="col-md-offset-4 col-md-1">
<button type="submit" class="btn btn-success" id="submit_login">Login</button>
<button type="submit" class="btn btn-success single-click" id="submit_login">Login</button>
</div>
<div class="col-md-4">
<p class="pull-right"><a href="/forgot-password/">Forgot password?</a>{{#if allow_create_new_accounts }} | <a href="/register/">Register new company</a>{{/if}}</p>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/add_new_bank_holiday_modal.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-link" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-success">Create</button>
<button type="submit" class="btn btn-success single-click">Create</button>
</div>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/add_new_department_modal.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-link" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-success">Create</button>
<button type="submit" class="btn btn-success single-click">Create</button>
</div>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/add_new_leave_type_modal.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-link" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-success">Create</button>
<button type="submit" class="btn btn-success single-click">Create</button>
</div>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/book_leave_modal.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-link" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-success">Create</button>
<button type="submit" class="btn btn-success single-click">Create</button>
{{# if redirect_back_to }}
<input type="hidden" name="redirect_back_to" value="{{redirect_back_to}}">
{{else}}
Expand Down
2 changes: 1 addition & 1 deletion views/partials/department_details/general.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@

<div class="row">
<div class="col-md-12">
<button id="save_changes_btn" type="submit" class="btn btn-success pull-right">Save changes to department</button>
<button id="save_changes_btn" type="submit" class="btn btn-success pull-right single-click">Save changes to department</button>
<a class="btn btn-link pull-right" href="/settings/departments/">Cancel</a>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/department_details/supervisers_modal.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-link" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-success" name="do_add_supervisors" value="1">Add selected employees</button>
<button type="submit" class="btn btn-success single-click" name="do_add_supervisors" value="1">Add selected employees</button>
</div>
</div>
</form>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/remove_company_modal.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-link" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-danger">Delete company account</button>
<button type="submit" class="btn btn-danger single-click">Delete company account</button>
</div>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/user_details/absences.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@

<div class="form-group">
<div class="col-md-12">
<button id="save_changes_btn" type="submit" class="btn btn-success pull-right">Save changes</button>
<button id="save_changes_btn" type="submit" class="btn btn-success pull-right single-click">Save changes</button>
</div>
</div>
</form>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/user_details/general.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@

<div class="row">
<div class="col-md-12">
<button id="save_changes_btn" type="submit" class="btn btn-success pull-right">Save changes</button>
<button id="save_changes_btn" type="submit" class="btn btn-success pull-right single-click">Save changes</button>
<a class="btn btn-link pull-right" href="/users/">Cancel</a>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions views/partials/user_requests.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
{{# unless this.is_pended_revoke_leave}}
<form method="post" action="/requests/revoke/">
<input type="hidden" value="{{this.id}}" name="request">
<button type="submit" class="pull-right btn btn-default btn-xs revoke-btn" title="Revoke leave request. Subject of approval."><i class="fa fa-trash"></i> Revoke</button>
<button type="submit" class="pull-right btn btn-default btn-xs revoke-btn single-click" title="Revoke leave request. Subject of approval."><i class="fa fa-trash"></i> Revoke</button>
</form>
{{/unless}}
{{else}}
{{#if_equal this.userId ../logged_user.id }}
<form method="post" action='/requests/cancel/'>
<input type="hidden" value="{{this.id}}" name="request">
<button type="submit" class="pull-right btn btn-default btn-xs revoke-btn" title="Cancel leave request" value="cancel"><i class="fa fa-trash"></i> Cancel</button>
<button type="submit" class="pull-right btn btn-default btn-xs revoke-btn single-click" title="Cancel leave request" value="cancel"><i class="fa fa-trash"></i> Cancel</button>
</form>
{{/if_equal}}
{{/if}}
Expand Down
4 changes: 2 additions & 2 deletions views/requests.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<td>{{this.comment.comment}}</td>
<td>
<form action="/requests/reject/" method="POST">
<input class="btn btn-warning" type="submit" value="Reject">
<input class="btn btn-warning single-click" type="submit" value="Reject">
<input type="hidden" value="{{this.id}}" name="request">
</form>
</td>
<td>
<form action="/requests/approve/" method="POST">
<input class="btn btn-success" type="submit" value="Approve">
<input class="btn btn-success single-click" type="submit" value="Approve">
<input type="hidden" value="{{this.id}}" name="request">
</form>
</td>
Expand Down
2 changes: 1 addition & 1 deletion views/reset_password.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<div class="form-group">
<div class="col-md-offset-4 col-md-2">
<button type="submit" class="btn btn-success" id="submit_login">Save</button>
<button type="submit" class="btn btn-success single-click" id="submit_login">Save</button>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion views/settings_company_authentication.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@

<div class="form-group">
<div class="col-md-offset-3 col-md-5">
<button id="submit_registration" type="submit" class="pull-right btn btn-success">Save LDAP configuration</button>
<button id="submit_registration" type="submit" class="pull-right btn btn-success single-click">Save LDAP configuration</button>
</div>
</div>

Expand Down
Loading

0 comments on commit df738ee

Please sign in to comment.