tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Move all the save logic after the validation

pull/18772/head
Enis Necipoglu 3 years ago
parent
596676de9e
commit
95277a4316
No known key found for this signature in database GPG Key ID: 1EC55E13241E1680
2 changed files with 55 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 86
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js
  2. 27
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js

86
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js
View File

@ -27,6 +27,7 @@ $(function () {
var UPPY_FILE_ID = "uppy-upload-file"; var UPPY_FILE_ID = "uppy-upload-file";
var isTagsEnabled = true; var isTagsEnabled = true;
var message = l('BlogPostSaveConfirmationMessage', $status.val());
$formCreate.data('validator').settings.ignore = ":hidden, [contenteditable='true']:not([name]), .tui-popup-wrapper"; $formCreate.data('validator').settings.ignore = ":hidden, [contenteditable='true']:not([name]), .tui-popup-wrapper";
@ -47,20 +48,31 @@ $(function () {
if ($formCreate.valid()) { if ($formCreate.valid()) {
$formCreate.ajaxSubmit({ abp.message.confirm(
success: function (result) { message,
if (isTagsEnabled) { async function (isConfirmed) {
submitEntityTags(result.id); if (isConfirmed) {
e.preventDefault();
await submitCoverImage();
$formCreate.ajaxSubmit({
success: function (result) {
if (isTagsEnabled) {
submitEntityTags(result.id);
}
else {
finishSaving();
}
},
error: function (result) {
abp.notify.error(result.responseJSON.error.message);
abp.ui.clearBusy();
}
});
} }
else {
finishSaving();
}
},
error: function (result) {
abp.notify.error(result.responseJSON.error.message);
abp.ui.clearBusy();
} }
}); );
} }
else { else {
abp.ui.clearBusy(); abp.ui.clearBusy();
@ -69,34 +81,23 @@ $(function () {
$buttonSubmit.click(function (e) { $buttonSubmit.click(function (e) {
e.preventDefault(); e.preventDefault();
message = l('BlogPostDraftConfirmationMessage', $title.val());
$status.val(blogPostStatus.Draft); $status.val(blogPostStatus.Draft);
submitCoverImage(); $formCreate.submit();
}); });
$buttonPublish.click(function (e) { $buttonPublish.click(function (e) {
abp.message.confirm( e.preventDefault();
l('BlogPostPublishConfirmationMessage', $title.val()), message = l('BlogPostPublishConfirmationMessage', $title.val());
function (isConfirmed) { $status.val(blogPostStatus.Published);
if (isConfirmed) { $formCreate.submit();
e.preventDefault();
$status.val(blogPostStatus.Published);
submitCoverImage();
}
}
);
}); });
$buttonSendToReview.click(function (e) { $buttonSendToReview.click(function (e) {
abp.message.confirm( e.preventDefault();
l('BlogPostSendToReviewConfirmationMessage', $title.val()), message = l('BlogPostSendToReviewConfirmationMessage', $title.val());
function (isConfirmed) { $status.val(blogPostStatus.SendToReview);
if (isConfirmed) { $formCreate.submit();
e.preventDefault();
$status.val(blogPostStatus.SendToReview);
submitCoverImage();
}
}
);
}); });
function submitEntityTags(blogPostId) { function submitEntityTags(blogPostId) {
@ -129,7 +130,7 @@ $(function () {
return headers; return headers;
} }
function submitCoverImage() { async function submitCoverImage() {
abp.ui.setBusy(); abp.ui.setBusy();
var UPPY_OPTIONS = { var UPPY_OPTIONS = {
@ -155,18 +156,15 @@ $(function () {
data: file, // file data: file, // file
}); });
UPPY.upload().then((result) => { var result = await UPPY.upload();
if (result.failed.length > 0) { if (result.failed.length > 0) {
abp.message.error(l("UploadFailedMessage")); abp.message.error(l("UploadFailedMessage"));
} else { } else {
$coverImage.val(result.successful[0].response.body.id); $coverImage.val(result.successful[0].response.body.id);
}
$formCreate.submit();
}
});
} }
else { else {
$formCreate.submit(); abp.ui.clearBusy();
} }
} }

27
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js
View File

@ -4,6 +4,7 @@ $(function () {
var $selectBlog = $('#BlogSelectionSelect'); var $selectBlog = $('#BlogSelectionSelect');
var $formUpdate = $('#form-blog-post-update'); var $formUpdate = $('#form-blog-post-update');
var $title = $('#ViewModel_Title');
var $coverImage = $('#ViewModel_CoverImageMediaId'); var $coverImage = $('#ViewModel_CoverImageMediaId');
var $slug = $('#ViewModel_Slug'); var $slug = $('#ViewModel_Slug');
var $buttonSubmit = $('#button-blog-post-update'); var $buttonSubmit = $('#button-blog-post-update');
@ -16,6 +17,7 @@ $(function () {
var UPPY_FILE_ID = "uppy-upload-file"; var UPPY_FILE_ID = "uppy-upload-file";
var isTagsEnabled = true; var isTagsEnabled = true;
var message = l('BlogPostSaveConfirmationMessage', $title.val());
$formUpdate.data('validator').settings.ignore = ":hidden, [contenteditable='true']:not([name]), .tui-popup-wrapper"; $formUpdate.data('validator').settings.ignore = ":hidden, [contenteditable='true']:not([name]), .tui-popup-wrapper";
@ -31,13 +33,15 @@ $(function () {
initSelectBlog(); initSelectBlog();
$formUpdate.on('submit', function (e) { $formUpdate.on('submit', async function (e) {
e.preventDefault(); e.preventDefault();
if ($formUpdate.valid()) { if ($formUpdate.valid()) {
abp.ui.setBusy(); abp.ui.setBusy();
await submitCoverImage();
$formUpdate.ajaxSubmit({ $formUpdate.ajaxSubmit({
success: function (result) { success: function (result) {
if (isTagsEnabled) { if (isTagsEnabled) {
@ -60,7 +64,7 @@ $(function () {
$buttonSubmit.click(function (e) { $buttonSubmit.click(function (e) {
e.preventDefault(); e.preventDefault();
submitCoverImage(); $formUpdate.submit();
}); });
function submitEntityTags(blogPostId) { function submitEntityTags(blogPostId) {
@ -93,7 +97,7 @@ $(function () {
return headers; return headers;
} }
function submitCoverImage() { async function submitCoverImage() {
abp.ui.setBusy(); abp.ui.setBusy();
var UPPY_OPTIONS = { var UPPY_OPTIONS = {
@ -119,18 +123,13 @@ $(function () {
data: file, // file data: file, // file
}); });
UPPY.upload().then((result) => { var result = await UPPY.upload();
if (result.failed.length > 0) {
abp.message.error(l("UploadFailedMessage"));
} else {
$coverImage.val(result.successful[0].response.body.id);
$formUpdate.submit(); if (result.failed.length > 0) {
} abp.message.error(l("UploadFailedMessage"));
}); } else {
} $coverImage.val(result.successful[0].response.body.id);
else { }
$formUpdate.submit();
} }
} }

Write Preview
Loading…
Cancel
Save