Portfolio: keep user seleccion context when going back to post list from post view - refs BT#22710

Author: NicoDucou

main/inc/lib/PortfolioController.php

@@ -1087,6 +1087,7 @@ public function index(HttpRequest $httpRequest)
 
         $template = new Template(null, false, false, false, false, false, false);
         $template->assign('user', $this->owner);
+        $template->assign('listByUser', $listByUser);
         $template->assign('course', $this->course);
         $template->assign('session', $this->session);
         $template->assign('portfolio', $portfolio);
@@ -1133,7 +1134,7 @@ public function index(HttpRequest $httpRequest)
      * @throws \Doctrine\ORM\OptimisticLockException
      * @throws \Doctrine\ORM\TransactionRequiredException
      */
-    public function view(Portfolio $item)
+    public function view(Portfolio $item, $urlUser)
     {
         global $interbreadcrumb;
 
@@ -1415,10 +1416,15 @@ public function view(Portfolio $item)
             $this->baseUrl.http_build_query(['action' => 'edit_item', 'id' => $item->getId()])
         );
 
+        $urlUserString = "";
+        if (isset($urlUser)) {
+            $urlUserString = "user=" . $urlUser;
+        }
+
         $actions = [];
         $actions[] = Display::url(
             Display::return_icon('back.png', get_lang('Back'), [], ICON_SIZE_MEDIUM),
-            $this->baseUrl
+            $this->baseUrl . $urlUserString
         );
 
         if ($this->itemBelongToOwner($item)) {

main/portfolio/index.php

@@ -190,7 +190,10 @@
             break;
         }
 
-        $controller->view($item);
+        if ($httpRequest->query->has('user')) {
+            $urlUser = $httpRequest->query->getInt('user');
+        }
+        $controller->view($item, $urlUser);
 
         return;
     case 'copy':

main/template/default/portfolio/items.html.twig

@@ -1,4 +1,4 @@
-{% macro display(items, category_id, _c, _u, _p) %}
+{% macro display(items, category_id, _c, _u, _p, user, listByUser) %}
     {% set edit_img = 'edit.png'|img(22, 'Edit'|get_lang) %}
     {% set visible_img = 'visible.png'|img(22, 'Invisible'|get_lang) %}
     {% set invisible_img = 'invisible.png'|img(22, 'Visible'|get_lang) %}
@@ -8,7 +8,11 @@
 
     <section class="portfolio-items">
         {% for item in items %}
-            {% set item_url = baseurl ~ {'action':'view', 'id':item.id}|url_encode %}
+            {% if listByUser %}
+                {% set item_url = baseurl ~ {'action':'view', 'id':item.id, 'user':user.id}|url_encode %}
+            {% else %}
+                {% set item_url = baseurl ~ {'action':'view', 'id':item.id}|url_encode %}
+            {% endif %}
             {% set comments = item.lastComments(3, is_advanced_sharing_enabled) %}
 
             {% if 'portfolio_show_base_course_post_in_sessions'|api_get_configuration_value %}

main/template/default/portfolio/list.html.twig

@@ -58,7 +58,7 @@
             <h4 class="page-header">{{ 'Posts'|get_lang }}</h4>
         {% endif %}
 
-        {{ items.display(uncategorized_items, 0, _c, _u, _p) }}
+        {{ items.display(uncategorized_items, 0, _c, _u, _p, user, listByUser) }}
 
         {% if found_comments %}
             <section>