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

workflow approve: error

Browse Source
This commit is contained in:
Arno Kaimbacher 2019-04-10 13:33:23 +02:00
parent 19fc0fa872
commit 8e8acf9f21
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Publish/WorkflowController.php
View File

@ -117,10 +117,18 @@ class WorkflowController extends Controller
*/ */
public function editorIndex() public function editorIndex()
{ {
$user = Auth::user();
$user_id = $user->id;
$builder = Dataset::query(); $builder = Dataset::query();
$datasets = $builder $datasets = $builder
//->where('server_state', 'inprogress') //->where('server_state', 'inprogress')
->whereIn('server_state', ['released', 'editor_accepted']) ->whereIn('server_state', ['released'])
//->where('server_state', 'editor_accepted')
->orWhere(function ($query) use ($user_id) {
$query->where('server_state', 'editor_accepted')
->where('editor_id', $user_id);
})
->get(); ->get();
return view('workflow.editor_index', compact('datasets')); return view('workflow.editor_index', compact('datasets'));
} }