diff --git a/src/CoreBundle/Controller/ResourceController.php b/src/CoreBundle/Controller/ResourceController.php index 2c442fc2b6..9e19257e9a 100644 --- a/src/CoreBundle/Controller/ResourceController.php +++ b/src/CoreBundle/Controller/ResourceController.php @@ -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); } diff --git a/src/CoreBundle/Repository/ResourceRepository.php b/src/CoreBundle/Repository/ResourceRepository.php index 8f1367250b..7db59c3e28 100644 --- a/src/CoreBundle/Repository/ResourceRepository.php +++ b/src/CoreBundle/Repository/ResourceRepository.php @@ -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); diff --git a/src/ThemeBundle/Resources/views/Resource/preview.html.twig b/src/ThemeBundle/Resources/views/Resource/preview.html.twig index 6cec2d810f..22650f803e 100644 --- a/src/ThemeBundle/Resources/views/Resource/preview.html.twig +++ b/src/ThemeBundle/Resources/views/Resource/preview.html.twig @@ -19,6 +19,17 @@ } ) }}" /> + {% elseif resource.resourceNode.hasEditableContent %} + {% else %} {% endif %}