Portfolio: fix query for item list

Author: AngelFQC

public/main/inc/lib/PortfolioController.php

@@ -3900,9 +3900,9 @@ private function getItemsForIndex(
 
                 $queryBuilder->andWhere(
                     $queryBuilder->expr()->orX(
-                        'links.user = :current_user',
+                        'node.creator = :current_user',
                         $queryBuilder->expr()->andX(
-                            'links.user != :current_user',
+                            'node.creator != :current_user',
                             $queryBuilder->expr()->in('resource.visibility', $visibilityCriteria)
                         )
                     )

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

@@ -24,7 +24,7 @@
             <div class="panel panel-default">
                 <article class="panel-body portfolio-item" id="portfolio-item-{{ item.id }}">
                     <div class="portfolio-actions pull-right">
-                        {% if app.user.id == item.user.id %}
+                        {% if app.user.id == item.resourceNode.creator.id %}
                             <a href="{{ baseurl ~ {'action':'edit_item', 'id':item.id}|url_encode }}">
                                 {{ 'edit.png'|icon(22, 'Edit'|get_lang) }}
                             </a>
@@ -52,13 +52,13 @@
                             <a href="{{ baseurl ~ {'action':'delete_item', 'id':item.id}|url_encode }}" class="btn-delete">
                                 {{ 'delete.png'|icon(22, 'Delete'|get_lang) }}
                             </a>
-                        {% elseif is_allowed_to_edit %}
+                        {% elseif is_allowed_to_edit_helper.check() %}
                             <a href="{{ baseurl ~ {'action':'edit_item', 'id':item.id}|url_encode }}">
                                 {{ 'edit.png'|icon(22, 'Edit'|get_lang) }}
                             </a>
                         {% endif %}
 
-                        {% if is_allowed_to_edit %}
+                        {% if is_allowed_to_edit_helper.check() %}
                             {% if item.isHighlighted %}
                                 <a href="{{ baseurl ~ {'action':'highlighted', 'id':item.id}|url_encode }}">
                                     {{ 'award_red.png'|icon(22, 'UnmarkAsHighlighted'|get_lang) }}
@@ -99,19 +99,19 @@
                             {% else %}
                                 <li>
                                     <span class="fa-li fa fa-user" aria-hidden="true"></span>
-                                    {{ item.user.completeName }}
+                                    {{ item.resourceNode.creator.fullName }}
                                 </li>
                             {% endif %}
 
                             <li>
                                 <span class="fa-li fa fa-clock-o" aria-hidden="true"></span>
-                                {{ 'CreationDate'|get_lang ~ ': ' ~ item.creationDate|date_to_time_ago }}
+                                {{ 'CreationDate'|get_lang ~ ': ' ~ item.resourceNode.createdAt|date_to_time_ago }}
                             </li>
 
-                            {% if item.creationDate != item.updateDate %}
+                            {% if item.resourceNode.createdAt != item.resourceNode.updatedAt %}
                                 <li>
                                     <span class="fa-li fa fa-clock-o" aria-hidden="true"></span>
-                                    {{ 'UpdateDate'|get_lang ~ ': ' ~ item.updateDate|date_to_time_ago }}
+                                    {{ 'UpdateDate'|get_lang ~ ': ' ~ item.resourceNode.updatedAt|date_to_time_ago }}
                                 </li>
                             {% endif %}
                         </ul>