Timon/SmartCane
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

changed urls for projects manager

Browse source
This commit is contained in:
guillaume91 2024-05-23 12:03:01 +02:00
parent 020ede073b
commit fc6edb2444
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
laravel_app/app/Http/Controllers/ProjectController.php
View file

@ -12,9 +12,9 @@ public function index()
return view('projects.index'); return view('projects.index');
} }
public function show(Project $project) public function show(Project $project,?string $currentTab = null)
{ {
return view('projects.show', compact('project')); return $currentTab ? view('projects.show', compact(['project', 'currentTab'])) : redirect(route('project.show', [$project->id, 'download']));
} }
} }

10
laravel_app/app/Livewire/Projects/ProjectManager.php
View file

@ -25,9 +25,6 @@ class ProjectManager extends Component
public $showMailSettingsModal = false; public $showMailSettingsModal = false;
public $projectIdBeingDeleted; public $projectIdBeingDeleted;
// public $span_json_path;
// public $pivot_json_path;
// public $harvest_json_path;
public array $pivotFiles; public array $pivotFiles;
public array $spanFiles; public array $spanFiles;
@ -59,13 +56,6 @@ public function editMailSettings(Project $project)
private function loadFormData(Project $project) private function loadFormData(Project $project)
{ {
$this->formData = $project->toArray(); $this->formData = $project->toArray();
// $this->pivot_json_path = $this->formData['pivot_json_path'];
// $this->span_json_path = $this->formData['span_json_path'];
// $this->harvest_json_path = $this->formData['harvest_json_path'];
// $this->formData['pivot_json_path'] = null;
// $this->formData['span_json_path'] = null;
// $this->formData['harvest_json_path'] = null;
// $this->formData['boundingBoxes'] = $project->boundingBoxes->toArray();
$this->formData['mail_recipients'] = $project->emailRecipients->toArray() ?: [ $this->formData['mail_recipients'] = $project->emailRecipients->toArray() ?: [
[ [
'name' => '', 'name' => '',

2
laravel_app/routes/web.php
View file

@ -29,7 +29,7 @@
Route::get('/dashboard', function () { Route::get('/dashboard', function () {
return view('dashboard'); return view('dashboard');
})->name('dashboard'); })->name('dashboard');
Route::get('/projects/{project}', [\App\Http\Controllers\ProjectController::class, 'show'])->name('project.show'); Route::get('/projects/{project}/{currentTab?}', [\App\Http\Controllers\ProjectController::class, 'show'])->name('project.show');
Route::get('/projects/{projectReport}/download', [\App\Http\Controllers\ProjectReportController::class, 'download'])->name('project.report.download'); Route::get('/projects/{projectReport}/download', [\App\Http\Controllers\ProjectReportController::class, 'download'])->name('project.report.download');
Route::get('/projects', [\App\Http\Controllers\ProjectController::class, 'index'])->name('project'); Route::get('/projects', [\App\Http\Controllers\ProjectController::class, 'index'])->name('project');
}); });