Merge pull request #5509 from christianbeeznest/ofaj-21685

Internal: Fix access issues in HTML block links for images and documents - refs BT#21685

Author: christianbeeznest

src/CoreBundle/Resources/views/Resource/preview.html.twig

@@ -11,8 +11,6 @@
                      "{{ url(
                          'chamilo_core_resource_view', {
                              'id': resource.resourceNode.id,
-                             'cid': course ? course.id : 0,
-                             'sid': session ? session.id : 0,
                              'type' : type,
                              'tool' : tool,
                              'filter' : 'resource_show_preview'
@@ -23,8 +21,6 @@
                 {% autoescape false %}
                 <iframe border="0" frameborder="0" style="width:100%;height:600px" src="{{ url('chamilo_core_resource_view', {
                     'id': resource.resourceNode.id,
-                    'cid': course ? course.id : 0,
-                    'sid': session ? session.id : 0,
                     'type' : type,
                     'tool' : tool
                 }
@@ -39,8 +35,6 @@
             <a
                 href="{{ url('chamilo_core_resource_download', {
                 'id': resource.resourceNode.id,
-                'cid': course ? course.id : 0,
-                'sid': session ? session.id : 0,
                 'type' : type,
                 'tool' : tool
             }

src/CoreBundle/Resources/views/Resource/toolbar_view_resource.html.twig

@@ -4,8 +4,6 @@
     <a class="btn btn--success"
        href="{{ url('chamilo_core_resource_view', {
            'id': resource.resourceNode.id,
-           'cid': course.id,
-           'sid': session.id,
            'type' : type,
            'tool' : tool,
            'mode' : 'download'

src/CoreBundle/Resources/views/Work/comments.html.twig

@@ -27,8 +27,6 @@
                     <a
                         href="{{ url('chamilo_core_resource_view', {
                             'id': comment.resourceNode.id,
-                            'cid': course ? course.id : 0,
-                            'sid': session ? session.id : 0,
                             'type' : 'student_publications_comments',
                             'tool' : 'student_publications',
                         })
@@ -65,4 +63,4 @@
 </ul>
 <br />
 
-{% endautoescape %}
+{% endautoescape %}

src/CoreBundle/Resources/views/Work/view.html.twig

@@ -24,8 +24,6 @@
     <a class="btn btn--success"
        href="{{ url('chamilo_core_resource_view', {
            'id': work.resourceNode.id,
-           'cid': course ? course.id : 0,
-           'sid': session ? session.id : 0,
            'tool' : 'student_publication',
            'type' : 'student_publications',
            'mode' : 'download'

src/CoreBundle/Serializer/ResourceNormalizer.php

@@ -64,14 +64,22 @@ public function normalize(
         if ($object->hasResourceNode()) {
             $resourceNode = $object->getResourceNode();
 
-            $params = [
-                'id' => $resourceNode->getUuid(),
-                'cid' => $courseId,
-                'sid' => $sessionId,
-                'gid' => $groupId,
-                'tool' => $resourceNode->getResourceType()->getTool()->getTitle(),
-                'type' => $resourceNode->getResourceType()->getTitle(),
-            ];
+            if ($resourceNode->hasResourceFile()) {
+                $params = [
+                    'id' => $resourceNode->getUuid(),
+                    'tool' => $resourceNode->getResourceType()->getTool()->getTitle(),
+                    'type' => $resourceNode->getResourceType()->getTitle(),
+                ];
+            } else {
+                $params = [
+                    'id' => $resourceNode->getUuid(),
+                    'cid' => $courseId,
+                    'sid' => $sessionId,
+                    'gid' => $groupId,
+                    'tool' => $resourceNode->getResourceType()->getTool()->getTitle(),
+                    'type' => $resourceNode->getResourceType()->getTitle(),
+                ];
+            }
 
             // if ($getFile) {
             // Get all links from resource.