Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: ywarnier

public/main/inc/lib/PortfolioController.php

@@ -3554,7 +3554,7 @@ private function processAttachments(
 
     private function itemBelongToOwner(Portfolio $item): bool
     {
-        if ($item->getUser()->getId() != $this->owner->getId()) {
+        if ($item->getCreator()->getId() != $this->owner->getId()) {
             return false;
         }
 

src/CoreBundle/Resources/views/Portfolio/items.html.twig

@@ -3,7 +3,7 @@
     {% set visible_img = 'ActionIcon::VISIBLE'|mdi_icon_t(22, 'ch-tool-icon', 'Invisible') %}
     {% set invisible_img = 'ActionIcon::INVISIBLE'|mdi_icon_t(22, 'ch-tool-icon', 'Visible') %}
     {% set delete_img = 'ActionIcon::DELETE'|mdi_icon_t(22, 'ch-tool-icon', 'Delete') %}
-    {% set baseurl = app.request.getPathInfo() ~ '?' ~ (app.request.queryString ? app.request.queryString ~ '&' : '') %}
+    {% set baseurl = '/main/portfolio/index.php' ~ '?' ~ (app.request.queryString ? app.request.queryString ~ '&' : '') %}
     {% set is_advanced_sharing_enabled = 'platform.portfolio_advanced_sharing'|api_get_setting and not _c is empty %}
 
     <section class="portfolio-items">
@@ -138,7 +138,7 @@
                                 <article>
                                     <footer>
                                         {{ 'ToolIcon::FORUM'|mdi_icon(22) }}
-                                        <strong>{{ comment.author.completeName }}</strong>
+                                        <strong>{{ comment.resourceNode.creator.fullName }}</strong>
                                         <small class="fa fa-clock-o fa-fw text-muted" aria-hidden="true"></small>
                                         <small class="text-muted">{{ comment.date|date_to_time_ago }}</small>
                                     </footer>

src/CoreBundle/Resources/views/Portfolio/list.html.twig

@@ -3,7 +3,7 @@
 {% set visible_img = 'ActionIcon::VISIBLE'|mdi_icon_t(22, 'ch-tool-icon', 'Invisible') %}
 {% set invisible_img = 'ActionIcon::INVISIBLE'|mdi_icon_t(22, 'ch-tool-icon', 'Visible') %}
 {% set delete_img = 'ActionIcon::DELETE'|mdi_icon_t(22, 'ch-tool-icon', 'Delete') %}
-{% set baseurl = _p.web_self ~ '?' ~ (_p.web_cid_query ? _p.web_cid_query ~ '&' : '') %}
+{% set baseurl = '/main/portfolio/index.php?' ~ (_p.web_cid_query ? _p.web_cid_query ~ '&' : '') %}
 
 {% import '@ChamiloCore/Portfolio/items.html.twig' as items %}
 
@@ -148,7 +148,7 @@
 
         {% if course %}
             $('form#frm_student_list select[name="user"]').on('change', function (e) {
-                var newLocation = '{{ _p.web_self ~ '?' ~ _p.web_cid_query }}';
+                var newLocation = '{{ '/main/portfolio/index.php?' ~ _p.web_cid_query }}';
 
                 if (this.value) {
                     newLocation += '&user=' + this.value;

src/CoreBundle/Twig/Extension/ChamiloExtension.php

@@ -49,8 +49,8 @@ public function getFilters(): array
         return [
             new TwigFilter('var_dump', 'var_dump'),
             new TwigFilter('icon', 'Display::get_icon_path'),
-            new TwigFilter('mdi_icon', 'Display::getMdiIconSimple'),
-            new TwigFilter('mdi_icon_t', 'Display::getMdiIconTranslate'),
+            new TwigFilter('mdi_icon', 'Display::getMdiIconSimple', ['is_safe' => ['html']]),
+            new TwigFilter('mdi_icon_t', 'Display::getMdiIconTranslate', ['is_safe' => ['html']]),
             new TwigFilter('get_lang', 'get_lang'),
             new TwigFilter('get_plugin_lang', 'get_plugin_lang'),
             new TwigFilter('api_get_local_time', 'api_get_local_time'),