Merge branch '3.2.x'

* 3.2.x:
  [ticket/15006] Pass inherit settings to form and use correct button
This commit is contained in:
Tristan Darricau 2017-01-22 23:07:53 +01:00
commit aa7ca1993d
No known key found for this signature in database
GPG key ID: 817043C2E29DB881

View file

@ -280,10 +280,11 @@ function submitPermissions() {
$.ajax({ $.ajax({
url: $form.action, url: $form.action,
type: 'POST', type: 'POST',
data: formData + '&' + $submitAllButton.name + '=' + encodeURIComponent($submitAllButton.value) + data: formData + '&' + $submitButton.name + '=' + encodeURIComponent($submitButton.value) +
'&creation_time=' + $form.find('input[type=hidden][name=creation_time]')[0].value + '&creation_time=' + $form.find('input[type=hidden][name=creation_time]')[0].value +
'&form_token=' + $form.find('input[type=hidden][name=form_token]')[0].value + '&form_token=' + $form.find('input[type=hidden][name=form_token]')[0].value +
'&' + $form.children('input[type=hidden]').serialize(), '&' + $form.children('input[type=hidden]').serialize() +
'&' + $form.find('input[type=checkbox][name^=inherit]').serialize(),
success: handlePermissionReturn, success: handlePermissionReturn,
error: handlePermissionReturn error: handlePermissionReturn
}); });