geolba/tethys
6
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases Packages Wiki Activity

- add translated description

Browse source 
- creator required
- filesize vrom ini file
- correctly delete dataset in SubmitController
This commit is contained in:
Arno Kaimbacher 2019-07-03 18:32:41 +02:00
parent 4f8ef4fc30
commit a463cb9e4c
10 changed files with 79 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Publish/IndexController.php
View file

@ -271,7 +271,7 @@ class IndexController extends Controller
$files = count($request->file('files')) - 1;
foreach (range(0, $files) as $index) {
// $rules['files.' . $index] = 'image|max:2048';
$rules['files.' . $index . '.file'] = ['required', 'file', new RdrFiletypes(), new RdrFilesize($index + 1)];
$rules['files.' . $index . '.file'] = ['required', new RdrFiletypes(), new RdrFilesize($index + 1)];
}
}
$validator = Validator::make($request->all(), $rules);

22
app/Http/Controllers/Publish/SubmitController.php
View file

@ -98,16 +98,7 @@ class SubmitController extends Controller
public function delete($id): RedirectResponse
{
$dataset = Dataset::with('files')->findOrFail($id);
if ($dataset->server_state != "inprogress" || $dataset->server_state != "rejected_editor") {
session()->flash(
'flash_message',
'You cannot delete this datastet!'
. ' There status of this dataset is '
. $dataset->server_state
. ' !'
);
return redirect()->route('settings.project');
} else {
if ($dataset->server_state == "inprogress" || $dataset->server_state == "rejected_editor") {
if ($dataset->files->count() > 0) {
foreach ($dataset->files as $file) {
if (isset($file->path_name)) {
@ -117,7 +108,16 @@ class SubmitController extends Controller
}
$dataset->delete();
session()->flash('flash_message', 'You have deleted 1 dataset!');
return redirect()->route('publish.workflow.index');
return redirect()->route('publish.workflow.submit.index');
} else {
session()->flash(
'flash_message',
'You cannot delete this datastet!'
. ' There status of this dataset is '
. $dataset->server_state
. ' !'
);
return redirect()->route('publish.workflow.submit.index');
}
}