Skip to content
Snippets Groups Projects
Commit 2e0e2b28 authored by David Siegfried's avatar David Siegfried
Browse files

show folder-size, closes #1402

Closes #1402

Merge request studip/studip!894
parent 699e552b
No related branches found
No related tags found
No related merge requests found
...@@ -331,12 +331,7 @@ class FileController extends AuthenticatedController ...@@ -331,12 +331,7 @@ class FileController extends AuthenticatedController
//The file system object is a folder. //The file system object is a folder.
//Calculate the files and the folder size: //Calculate the files and the folder size:
$this->folder_size = 0; list($this->folder_size, $this->folder_file_amount) = $this->getFolderSize($this->folder);
$this->folder_file_amount = 0;
foreach ($this->folder->getFiles() as $file) {
$this->folder_file_amount++;
$this->folder_size += $file->getSize();
}
PageLayout::setTitle($this->folder->name); PageLayout::setTitle($this->folder->name);
$this->render_action('folder_details'); $this->render_action('folder_details');
} }
...@@ -1918,6 +1913,7 @@ class FileController extends AuthenticatedController ...@@ -1918,6 +1913,7 @@ class FileController extends AuthenticatedController
PageLayout::postMessage($result); PageLayout::postMessage($result);
} }
} }
list($this->folder_size, $this->folder_file_amount) = $this->getFolderSize($folder);
} }
public function delete_folder_action($folder_id) public function delete_folder_action($folder_id)
...@@ -2148,4 +2144,15 @@ class FileController extends AuthenticatedController ...@@ -2148,4 +2144,15 @@ class FileController extends AuthenticatedController
return \FilesController::getRangeLink($folder) . '#fileref_' . $fileRef->id; return \FilesController::getRangeLink($folder) . '#fileref_' . $fileRef->id;
} }
private function getFolderSize($folder): array
{
$folder_size = 0;
$folder_file_amount = 0;
foreach ($folder->getFiles() as $file) {
$folder_size += $file->getSize();
$folder_file_amount++;
}
return [$folder_size, $folder_file_amount];
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment