Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

main/inc/ajax/lp.ajax.php

@@ -50,7 +50,10 @@ switch ($action) {
         $lpId = isset($_GET['lp_id']) ? $_GET['lp_id'] : false;
         $url = isset($_GET['url']) ? $_GET['url'] : '';
         $addMove = isset($_GET['add_move_button']) && $_GET['add_move_button'] == 1 ? true : false;
-
+        $showOnlyFolders = false;
+        if (isset($_GET['showOnlyFolders'])) {
+            $showOnlyFolders = (1 == (int) $_GET['showOnlyFolders']);
+        }
         echo DocumentManager::get_document_preview(
             $courseInfo,
             $lpId,
@@ -60,7 +63,7 @@ switch ($action) {
             null,
             $url,
             true,
-            false,
+            $showOnlyFolders,
             $folderId,
             false
         );

main/inc/lib/document.lib.php

@@ -3650,8 +3650,9 @@ class DocumentManager
 
         $return .= $writeResult;
         $lpAjaxUrl = api_get_path(WEB_AJAX_PATH).'lp.ajax.php';
+        $extraAjaxParams = ($showOnlyFolders ? '&showOnlyFolders='.(int) $showOnlyFolders : '');
         if ($lp_id === false) {
-            $url = $lpAjaxUrl.'?a=get_documents&lp_id=&cidReq='.$course_info['code'];
+            $url = $lpAjaxUrl.'?a=get_documents&lp_id=&cidReq='.$course_info['code'].$extraAjaxParams;
             $return .= "<script>
             $(function() {
                 $('.close_div').click(function() {
@@ -3665,7 +3666,7 @@ class DocumentManager
             </script>";
         } else {
             // For LPs
-            $url = $lpAjaxUrl.'?a=get_documents&lp_id='.(int) $lp_id.'&'.api_get_cidreq();
+            $url = $lpAjaxUrl.'?a=get_documents&lp_id='.(int) $lp_id.'&'.api_get_cidreq().$extraAjaxParams;
         }
 
         if (!empty($overwrite_url)) {

main/inc/lib/statistics.lib.php

@@ -1787,6 +1787,8 @@ class Statistics
 
     public static function returnDuplicatedUsersTable(): string
     {
+        $formFields = TrackingCourseLog::displayAdditionalProfileFields([], api_get_self());
+
         $additionalProfileField = $_GET['additional_profile_field'] ?? [];
 
         $additionalExtraFieldsInfo = [];
@@ -1853,7 +1855,7 @@ class Statistics
         );
         $table->setHideColumn(0);
 
-        return TrackingCourseLog::displayAdditionalProfileFields([], api_get_self())
+        return $formFields
             .PHP_EOL
             .$table->return_table();
     }