From b24c2b8455956083c7dcdaf9dd72de22a761d3c4 Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Fri, 3 Jun 2016 14:50:17 +0000 Subject: [PATCH] Customer portal : Improved user feedback on modal loading crashs SVN:trunk[4183] --- .../2.x/itop-portal-base/portal/src/views/layout.html.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig index 2be659ad15..3e605710cf 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig @@ -327,7 +327,9 @@ // Display a error message on modal if the content could not be loaded. // Note : As of now, we can't display a more detailled message based on the response because Bootstrap doesn't pass response data with the loaded event. $('body').on('loaded.bs.modal', function (oEvent) { - if($(oEvent.target).find('.modal-content').html().replace(/[\n\r\t]+/g, '') === contentLoaderTemplate) + var sModalContent = $(oEvent.target).find('.modal-content').html(); + + if( (sModalContent === '') || (sModalContent.replace(/[\n\r\t]+/g, '') === contentLoaderTemplate) ) { $(oEvent.target).find('.modal-content').html($('#modal-for-alert .modal-content').html()); $(oEvent.target).find('.modal-content .modal-header .modal-title').text('{{ 'Error:HTTP:500'|dict_s }}');