- release form mit radio buttons um preferred reviewer verpflichtend auswählen zu müssen
- reject form for editor - beim Releasen mind. 1 Datensatz angeben
This commit is contained in:
parent
178d0e7f6b
commit
fed2fafd55
9 changed files with 66 additions and 17 deletions
|
@ -210,7 +210,9 @@ class EditorController extends Controller
|
|||
$dataset = Dataset::findOrFail($id);
|
||||
$input = $request->all();
|
||||
$input['server_state'] = 'approved';
|
||||
$input['reject_reviewer_note'] = '';
|
||||
if ($dataset->reject_reviewer_note != null) {
|
||||
$input['[reject_reviewer_note'] = null;
|
||||
}
|
||||
|
||||
if ($dataset->update($input)) {
|
||||
// event(new PageUpdated($page));
|
||||
|
|
|
@ -60,10 +60,23 @@ class SubmitController extends Controller
|
|||
public function releaseUpdate(Request $request, $id)
|
||||
{
|
||||
$dataset = Dataset::findOrFail($id);
|
||||
if ($dataset->files->count() == 0) {
|
||||
return back()
|
||||
->withErrors(['datasets_count' => ['At least one dataset is required.']]);
|
||||
}
|
||||
|
||||
$input = $request->all();
|
||||
//immer released setzen
|
||||
$input['server_state'] = 'released';
|
||||
//editor wieder löschen falls rejected
|
||||
if ($dataset->editor_id !== null) {
|
||||
$input['editor_id'] = null;
|
||||
}
|
||||
|
||||
if ($dataset->reject_editor_note != null) {
|
||||
$input['reject_editor_note'] = null;
|
||||
}
|
||||
|
||||
if ($dataset->update($input)) {
|
||||
// event(new PageUpdated($page));
|
||||
return redirect()
|
||||
|
|
|
@ -40,7 +40,8 @@ class Dataset extends Model
|
|||
'preferred_reviewer',
|
||||
'preferred_reviewer_email',
|
||||
'reviewer_id',
|
||||
'reject_reviewer_note'
|
||||
'reject_reviewer_note',
|
||||
'reject_editor_note'
|
||||
];
|
||||
//protected $guarded = [];
|
||||
/**
|
||||
|
|
Loading…
Add table
editor.link_modal.header
Reference in a new issue