diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index a8a9ecee41e9..54e3f9238a0d 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -49,6 +49,20 @@ class ProjectController extends BaseController return $this->projectService->getDatatable($search, $userId); } + public function show(ProjectRequest $request) + { + $project = $request->entity(); + + $data = [ + 'account' => auth()->user()->account, + 'project' => $project, + 'title' => trans('texts.view_project'), + 'showBreadcrumbs' => false, + ]; + + return View::make('projects.show', $data); + } + public function create(ProjectRequest $request) { $data = [ diff --git a/app/Ninja/Datatables/ProjectDatatable.php b/app/Ninja/Datatables/ProjectDatatable.php index 85f9cb142f05..84542dc0e960 100644 --- a/app/Ninja/Datatables/ProjectDatatable.php +++ b/app/Ninja/Datatables/ProjectDatatable.php @@ -21,7 +21,7 @@ class ProjectDatatable extends EntityDatatable return $model->project; } - $str = link_to("projects/{$model->public_id}/edit", $model->project)->toHtml(); + $str = link_to("projects/{$model->public_id}", $model->project)->toHtml(); return $this->addNote($str, $model->private_notes); }, ], diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 551a186431ff..b136afaa3961 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2624,6 +2624,8 @@ $LANG = array( 'convert_products_help' => 'Automatically convert product prices to the client\'s currency', 'improve_client_portal_link' => 'Set a subdomain to shorten the client portal link.', 'budgeted_hours' => 'Budgeted Hours', + 'progress' => 'Progress', + 'view_project' => 'View Project', ); diff --git a/resources/views/projects/show.blade.php b/resources/views/projects/show.blade.php new file mode 100644 index 000000000000..0fc59eec0fb7 --- /dev/null +++ b/resources/views/projects/show.blade.php @@ -0,0 +1,86 @@ +@extends('header') + +@section('head') + @parent + + + +@stop + + +@section('content') + +