From 6961c48ecb17c75b9ae4f144796c24d7397db4a8 Mon Sep 17 00:00:00 2001 From: carlos alvarado Date: Wed, 24 Jun 2020 11:03:59 -0500 Subject: [PATCH] Wrong file list order on last_sent column in Dropbox 3162 Add last edit date at start to sort correctly by date --- main/document/document.php | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/main/document/document.php b/main/document/document.php index 2d88ceddc5..520e2c91da 100755 --- a/main/document/document.php +++ b/main/document/document.php @@ -1913,17 +1913,21 @@ if (!empty($documentAndFolders)) { $displaySize = format_file_size($document_data['size']); } - $row[] = ''.$size.''. - $invisibility_span_open. - $displaySize. + $row[] = '' . $size . '' . + $invisibility_span_open . + $displaySize . $invisibility_span_close; // Last edit date $last_edit_date = api_get_local_time($document_data['lastedit_date']); - $display_date = date_to_str_ago($document_data['lastedit_date']). - '
'.$last_edit_date."
"; + $display_date = date_to_str_ago($document_data['lastedit_date']) . + '
' . $last_edit_date . "
"; - $row[] = $invisibility_span_open.$display_date.$invisibility_span_close; + /* add last edit date at begin to short by date*/ + $row[] = "" . $last_edit_date . "" . + $invisibility_span_open . + $display_date . + $invisibility_span_close; $groupMemberWithEditRightsCheckDocument = GroupManager::allowUploadEditDocument( $userId, @@ -2060,12 +2064,13 @@ $column_show[] = 0; $column_order = []; -if (count($row) == 12) { - //teacher - $column_order[2] = 8; //name - $column_order[3] = 7; - $column_order[4] = 6; -} elseif (count($row) == 10) { +if (count($row) == 12) + { + //teacher + $column_order[2] = 8; //name + $column_order[3] = 7; //size + $column_order[4] = 6; //lastedit_date + } elseif (count($row) == 10) { //student $column_order[1] = 6; $column_order[2] = 5; @@ -2149,7 +2154,6 @@ echo $templateForm; echo $moveForm; echo $dirForm; echo $selector; - $table->display(); if (count($documentAndFolders) > 1) {