Show html document in an iframe

pull/3064/head
Julio 5 years ago
parent 060ccca77d
commit 339b0bba1d
  1. 11
      src/CoreBundle/Controller/ResourceController.php
  2. 2
      src/CoreBundle/Repository/ResourceRepository.php
  3. 11
      src/ThemeBundle/Resources/views/Resource/preview.html.twig

@ -437,8 +437,6 @@ class ResourceController extends AbstractResourceController implements CourseCon
*/
public function editAction(Request $request): Response
{
$tool = $request->get('tool');
$type = $request->get('type');
$resourceNodeId = $request->get('id');
$this->setBreadCrumb($request);
@ -492,9 +490,10 @@ class ResourceController extends AbstractResourceController implements CourseCon
$this->addFlash('success', $this->trans('Updated'));
if ($newResource->getResourceNode()->hasResourceFile()) {
//$resourceNodeParentId = $newResource->getResourceNode()->getParent()->getId();
}
//if ($newResource->getResourceNode()->hasResourceFile()) {
$resourceNodeParentId = $newResource->getResourceNode()->getParent()->getId();
//}
$routeParams['id'] = $resourceNodeParentId;
return $this->redirectToRoute('chamilo_core_resource_list', $routeParams);
}
@ -1105,7 +1104,7 @@ class ResourceController extends AbstractResourceController implements CourseCon
$handle = tmpfile();
fwrite($handle, $content);
$meta = stream_get_meta_data($handle);
$file = new UploadedFile($meta['uri'], $fileName, null, null, true);
$file = new UploadedFile($meta['uri'], $fileName, 'text/html', null, true);
$em->persist($newResource);
}

@ -266,7 +266,7 @@ class ResourceRepository extends EntityRepository
}
$em = $this->getEntityManager();
//$resourceFile->setMimeType($file->getMimeType());
$resourceFile->setFile($file);
$resourceFile->setName($resource->getResourceName());
$em->persist($resourceFile);

@ -19,6 +19,17 @@
}
) }}"
/>
{% elseif resource.resourceNode.hasEditableContent %}
<iframe border="0" frameborder="0" style="width:100%;height:600px" src="{{ url('chamilo_core_resource_view', {
'id': resource.resourceNode.id,
'cid': course.id,
'sid': session.id,
'type' : type,
'tool' : tool
}
)
}}">
</iframe>
{% else %}
{% endif %}
<br />

Loading…
Cancel
Save