소스 검색

Customer portal : Improved user feedback on modal loading crashs

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4183 a333f486-631f-4898-b8df-5754b55c2be0
glajarige 9 년 전
부모
커밋
669663384a
1개의 변경된 파일3개의 추가작업 그리고 1개의 파일을 삭제
  1. 3 1
      datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig

+ 3 - 1
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 }}');