File tree Expand file tree Collapse file tree 3 files changed +13
-12
lines changed
modules/electrophysiology_uploader Expand file tree Collapse file tree 3 files changed +13
-12
lines changed Original file line number Diff line number Diff line change @@ -77,14 +77,12 @@ export default function UploadViewer(props) {
7777 ] ;
7878
7979 return (
80- < >
81- < FilterableDataTable
82- name = 'eeg_upload_viewer'
83- data = { props . data }
84- fields = { fields }
85- getFormattedCell = { formatColumn }
86- />
87- </ >
80+ < FilterableDataTable
81+ name = 'eeg_upload_viewer'
82+ data = { props . data }
83+ fields = { fields }
84+ getFormattedCell = { formatColumn }
85+ />
8886 ) ;
8987}
9088
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ class Electrophysiology_Uploader extends \DataFrameworkMenu
5050 */
5151 public function useProjectFilter (): bool
5252 {
53- return false ;
53+ return true ;
5454 }
5555
5656 /**
Original file line number Diff line number Diff line change @@ -125,8 +125,8 @@ class Upload extends \NDB_Page
125125 if (empty ($ request ->getUploadedFiles ()) && empty ($ values )) {
126126 $ upload_max_size = \Utility::getMaxUploadSize ();
127127 return new \LORIS \Http \Response \JSON \InternalServerError (
128- "The uploaded file size ( $ upload_max_size ) exceeds " .
129- "the upload_max_filesize or post_max_size directive in php.ini "
128+ "The uploaded file size exceeds the upload_max_filesize " .
129+ "or post_max_size directive in php.ini ( $ upload_max_size ) "
130130 );
131131 }
132132
@@ -176,7 +176,10 @@ class Upload extends \NDB_Page
176176 );
177177 }
178178
179- // Check for existing files
179+ // Check for an existing file
180+ // If found, add a timestamp suffix to avoid collision
181+ // with any other existing upload attempt
182+ // and move the renamed file in _EEGUploadIncomingPath_/archives/
180183 $ targetPath = $ targetdir ->getPathname () . '/ ' . $ filename ;
181184 if (file_exists ($ targetPath )) {
182185 $ archiveFilename = str_replace (
You can’t perform that action at this time.
0 commit comments