diff --git a/app/Http/Controllers/Projects/JobsController.php b/app/Http/Controllers/Projects/JobsController.php index 87b5749..097aa6f 100755 --- a/app/Http/Controllers/Projects/JobsController.php +++ b/app/Http/Controllers/Projects/JobsController.php @@ -33,7 +33,7 @@ class JobsController extends Controller { $workers = $this->repo->getWorkersList(); - return view('jobs.create', compact('project', 'workers')); + return view('projects.jobs.create', compact('project', 'workers')); } public function addFromOtherProject(Request $request, Project $project) @@ -43,10 +43,10 @@ class JobsController extends Controller $projects = $this->repo->getProjectsList(); if ($request->has('project_id')) { - $selectedProject = $this->repo->requireProjectById($request->get('project_id')); + $selectedProject = Project::find($request->get('project_id')); } - return view('jobs.add-from-other-project', compact('project', 'workers', 'projects', 'selectedProject')); + return view('projects.jobs.add-from-other-project', compact('project', 'workers', 'projects', 'selectedProject')); } public function store(CreateRequest $req, $projectId) diff --git a/resources/views/jobs/add-from-other-project.blade.php b/resources/views/projects/jobs/add-from-other-project.blade.php similarity index 60% rename from resources/views/jobs/add-from-other-project.blade.php rename to resources/views/projects/jobs/add-from-other-project.blade.php index 5d07c90..94293a4 100755 --- a/resources/views/jobs/add-from-other-project.blade.php +++ b/resources/views/projects/jobs/add-from-other-project.blade.php @@ -1,27 +1,25 @@ -@extends('layouts.app') +@extends('layouts.project') -@section('title', __('job.add_from_other_project').' | '.$project->name) +@section('subtitle', __('job.create')) -@section('content') -@include('projects.partials.breadcrumb',['title' => __('job.add_from_other_project')]) +@section('action-buttons') +@can('create', new App\Entities\Projects\Job) + {!! html_link_to_route('projects.jobs.create', trans('job.create'), [$project->id], ['class' => 'btn btn-success','icon' => 'plus']) !!} + {!! html_link_to_route('projects.jobs.add-from-other-project', trans('job.add_from_other_project'), [$project->id], ['class' => 'btn btn-default','icon' => 'plus']) !!} +@endcan +@endsection + +@section('content-project')