Skip to content

Commit 36fb100

Browse files
Jeremy DelocheFrancoisEricMerlin
authored andcommitted
LUT-31027 : message when PJ too heavy
1 parent a046fd5 commit 36fb100

File tree

4 files changed

+34
-7
lines changed

4 files changed

+34
-7
lines changed

src/java/fr/paris/lutece/plugins/blog/resources/blog_messages.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ message.default.blogTitle=Title...
292292
message.blogTitleNotEmpty=Please add a title !
293293
message.default.blogDescription=Description...
294294
message.blogDescriptionNotEmpty=Please add a description
295+
message.blogFileUpload=An error has occurred
295296

296297
# Blog error messages
297298
error.history.blog.cantRemoveOriginal=You can't delete the original version of the post

src/java/fr/paris/lutece/plugins/blog/resources/blog_messages_fr.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ message.default.blogTitle=Titre...
321321
message.blogTitleNotEmpty=Veuillez saisir un titre
322322
message.default.blogDescription=Description...
323323
message.blogDescriptionNotEmpty=Veuillez saisir une description
324+
message.blogFileUpload=Une erreur est survenue
324325

325326
# keys for business classes keys : TAG
326327
manage_tags.pageTitle=Blog - Gestion des tags

webapp/WEB-INF/templates/admin/plugins/blog/blog_commons.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242

4343
var msgErrorBlogLocked = '#i18n{blog.message.blogLocked}'
4444
var msgErrorBlogFileCannotBeDeleted = '#i18n{blog.message.blogFileCannotBeDeleted}'
45-
var msgErrorBlogFileTypeNotUpdated = '#i18n{blog.message.blogFileTypeNotUpdated}'
45+
var msgErrorBlogFileTypeNotUpdated = '#i18n{blog.message.blogFileTypeNotUpdated}'
46+
var msgErrorFileUpload = '#i18n{blog.message.blogFileUpload}'
4647

4748
var labelWarning='#i18n{portal.util.labelWarning}'
4849
var labelDanger='#i18n{portal.util.labelDanger}'

webapp/themes/admin/shared/plugins/blog/js/blog.js

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -291,12 +291,36 @@ async function doAddContent( fileName, result, fileType, idBlog ){
291291
datatype : 'multipart/form-data',
292292
body: formData,
293293
})
294-
if (!response.ok) {
295-
setBlogToast( typeDanger , labelError, response.statusText )
296-
} else {
297-
const resp = await response.json();
298-
return resp;
299-
}
294+
295+
const data = await response.text();
296+
if (data.trim().startsWith("<!DOCTYPE html") || data.trim().startsWith("<html")) {
297+
parseAdminMessageError( data );
298+
return { status : "KO" };
299+
}
300+
else
301+
{
302+
if (!response.ok) {
303+
setBlogToast( typeDanger , labelError, response.statusText )
304+
} else {
305+
const resp = JSON.parse(data);
306+
return resp;
307+
}
308+
}
309+
}
310+
311+
function parseAdminMessageError( htmlContent )
312+
{
313+
const parser = new DOMParser();
314+
const doc = parser.parseFromString(htmlContent, "text/html");
315+
const message = doc.querySelector("p.text-center");
316+
if( message )
317+
{
318+
setBlogToast( typeDanger , labelError, message.innerText )
319+
}
320+
else
321+
{
322+
setBlogToast( typeDanger , labelError, msgErrorFileUpload )
323+
}
300324
}
301325

302326
function doInsertContent( idContent, titleContent, typeContent ) {

0 commit comments

Comments
 (0)