Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop
commit
68ca3b4a46
|
@ -77,11 +77,11 @@ echo $this->Bootstrap->modal([
|
||||||
<script>
|
<script>
|
||||||
function submitRegistration(modalObject, tmpApi) {
|
function submitRegistration(modalObject, tmpApi) {
|
||||||
const $form = modalObject.$modal.find('form')
|
const $form = modalObject.$modal.find('form')
|
||||||
tmpApi.postForm($form[0]).then(() => {
|
return tmpApi.postForm($form[0]).then((result) => {
|
||||||
const url = '/inbox/index'
|
const url = '/inbox/index'
|
||||||
const $container = $('div[id^="table-container-"]')
|
const $container = $('div[id^="table-container-"]')
|
||||||
const randomValue = $container.attr('id').split('-')[2]
|
const randomValue = $container.attr('id').split('-')[2]
|
||||||
UI.reload(url, $(`#table-container-${randomValue}`), $(`#table-container-${randomValue} table.table`))
|
return result
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -715,11 +715,11 @@ class ModalFactory {
|
||||||
})
|
})
|
||||||
this.ajaxApi.push(tmpApi)
|
this.ajaxApi.push(tmpApi)
|
||||||
} else {
|
} else {
|
||||||
this.ajaxApi.statusNode = $buttonConfirm[0]
|
this.ajaxApi.options.statusNode = $buttonConfirm[0]
|
||||||
this.ajaxApi = [this.ajaxApi];
|
this.ajaxApi = [this.ajaxApi];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.ajaxApi.statusNode = $buttonConfirm[0]
|
this.ajaxApi.options.statusNode = $buttonConfirm[0]
|
||||||
}
|
}
|
||||||
return (evt) => {
|
return (evt) => {
|
||||||
let confirmFunction = this.options.confirm
|
let confirmFunction = this.options.confirm
|
||||||
|
@ -763,7 +763,7 @@ class ModalFactory {
|
||||||
return clickResult
|
return clickResult
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
if (data.success) {
|
if (data.success) {
|
||||||
selfModal.options.POSTSuccessCallback(data)
|
selfModal.options.POSTSuccessCallback([data, this])
|
||||||
} else { // Validation error
|
} else { // Validation error
|
||||||
selfModal.injectFormValidationFeedback(form, data.errors)
|
selfModal.injectFormValidationFeedback(form, data.errors)
|
||||||
return Promise.reject('Validation error');
|
return Promise.reject('Validation error');
|
||||||
|
@ -799,7 +799,7 @@ class ModalFactory {
|
||||||
return clickResult
|
return clickResult
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
if (data.success) {
|
if (data.success) {
|
||||||
this.options.POSTSuccessCallback(data)
|
this.options.POSTSuccessCallback([data, this])
|
||||||
} else { // Validation error
|
} else { // Validation error
|
||||||
this.injectFormValidationFeedback(form, data.errors)
|
this.injectFormValidationFeedback(form, data.errors)
|
||||||
return Promise.reject('Validation error');
|
return Promise.reject('Validation error');
|
||||||
|
|
Loading…
Reference in New Issue