Bladeren bron

#475 Portal : Could not upload attachments on IE9.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4457 a333f486-631f-4898-b8df-5754b55c2be0
glajarige 8 jaren geleden
bovenliggende
commit
d617af858f

+ 2 - 1
datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php

@@ -1386,7 +1386,8 @@ class ObjectController extends AbstractController
 					}
 				}
 
-				$oResponse = $oApp->json($aData);
+				// Note : The Content-Type header is set to 'text/plain' in order to be IE9 compatible. Otherwise ('application/json') IE9 will download the response as a JSON file to the user computer...
+				$oResponse = $oApp->json($aData, 200, array('Content-Type' => 'text/plain'));
 				break;
 
 			case 'download':

+ 1 - 0
datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig

@@ -62,6 +62,7 @@
 		<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] }}lib/jquery/jquery-1.11.3.min.js"></script>
 		<script type="text/javascript" src="{{ app['combodo.absolute_url'] }}js/jquery-ui-1.10.3.custom.min.js"></script>
 		<script type="text/javascript" src="{{ app['combodo.absolute_url'] }}js/jquery.magnific-popup.min.js"></script>
+		<script type="text/javascript" src="{{ app['combodo.absolute_url'] }}js/jquery.iframe-transport.js"></script>
 		<script type="text/javascript" src="{{ app['combodo.absolute_url'] }}js/jquery.fileupload.js"></script>
 		<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] }}lib/bootstrap/js/bootstrap.min.js"></script>
 		<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] }}lib/latinise/latinise.min.js"></script>