Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ message.default.blogTitle=Title...
message.blogTitleNotEmpty=Please add a title !
message.default.blogDescription=Description...
message.blogDescriptionNotEmpty=Please add a description
message.blogFileUpload=An error has occurred

# Blog error messages
error.history.blog.cantRemoveOriginal=You can't delete the original version of the post
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ message.default.blogTitle=Titre...
message.blogTitleNotEmpty=Veuillez saisir un titre
message.default.blogDescription=Description...
message.blogDescriptionNotEmpty=Veuillez saisir une description
message.blogFileUpload=Une erreur est survenue

# keys for business classes keys : TAG
manage_tags.pageTitle=Blog - Gestion des tags
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@

var msgErrorBlogLocked = '#i18n{blog.message.blogLocked}'
var msgErrorBlogFileCannotBeDeleted = '#i18n{blog.message.blogFileCannotBeDeleted}'
var msgErrorBlogFileTypeNotUpdated = '#i18n{blog.message.blogFileTypeNotUpdated}'
var msgErrorBlogFileTypeNotUpdated = '#i18n{blog.message.blogFileTypeNotUpdated}'
var msgErrorFileUpload = '#i18n{blog.message.blogFileUpload}'

var labelWarning='#i18n{portal.util.labelWarning}'
var labelDanger='#i18n{portal.util.labelDanger}'
Expand Down
36 changes: 30 additions & 6 deletions webapp/themes/admin/shared/plugins/blog/js/blog.js
Original file line number Diff line number Diff line change
Expand Up @@ -273,12 +273,36 @@ async function doAddContent( fileName, result, fileType, idBlog ){
datatype : 'multipart/form-data',
body: formData,
})
if (!response.ok) {
setBlogToast( typeDanger , labelError, response.statusText )
} else {
const resp = await response.json();
return resp;
}

const data = await response.text();
if (data.trim().startsWith("<!DOCTYPE html") || data.trim().startsWith("<html")) {
parseAdminMessageError( data );
return { status : "KO" };
}
else
{
if (!response.ok) {
setBlogToast( typeDanger , labelError, response.statusText )
} else {
const resp = JSON.parse(data);
return resp;
}
}
}

function parseAdminMessageError( htmlContent )
{
const parser = new DOMParser();
const doc = parser.parseFromString(htmlContent, "text/html");
const message = doc.querySelector("p.text-center");
if( message )
{
setBlogToast( typeDanger , labelError, message.innerText )
}
else
{
setBlogToast( typeDanger , labelError, msgErrorFileUpload )
}
}

function doInsertContent( idContent, titleContent, typeContent ) {
Expand Down