moved clearValidation
to openDataModal
, so it's always called
This commit is contained in:
parent
204bc07739
commit
9b5d4a9d99
@ -347,6 +347,7 @@ function setTableControlsUsability(tableId, disabled) {
|
|||||||
async function openDataModal(modalId, pk, url) {
|
async function openDataModal(modalId, pk, url) {
|
||||||
$modal = $(modalId);
|
$modal = $(modalId);
|
||||||
$modal.data("primary-key", pk);
|
$modal.data("primary-key", pk);
|
||||||
|
clearValidation($modal);
|
||||||
|
|
||||||
if (parseInt(pk) === -1) {
|
if (parseInt(pk) === -1) {
|
||||||
$modal.find(".form-create").show();
|
$modal.find(".form-create").show();
|
||||||
@ -388,7 +389,6 @@ function clearValidation($modal) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function loadModalData($modal, url) {
|
async function loadModalData($modal, url) {
|
||||||
clearValidation($modal);
|
|
||||||
const data = await ajaxRequest(url, "GET");
|
const data = await ajaxRequest(url, "GET");
|
||||||
|
|
||||||
$modal.find("[data-field]").each(function() {
|
$modal.find("[data-field]").each(function() {
|
||||||
@ -450,8 +450,8 @@ async function onModalSubmit($modal, $table, url) {
|
|||||||
|
|
||||||
ajaxRequest(url, method, formData)
|
ajaxRequest(url, method, formData)
|
||||||
.then(response => {
|
.then(response => {
|
||||||
$modal.modal("hide");
|
|
||||||
$table.trigger("doDataLoad");
|
$table.trigger("doDataLoad");
|
||||||
|
$modal.modal("hide");
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
logError(error);
|
logError(error);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user