diff --git a/resources/views/projects/jobs/index.blade.php b/resources/views/projects/jobs/index.blade.php
index 2f4ab82..c68ab20 100755
--- a/resources/views/projects/jobs/index.blade.php
+++ b/resources/views/projects/jobs/index.blade.php
@@ -3,8 +3,10 @@
@section('subtitle', trans('project.jobs'))
@section('action-buttons')
-{!! 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']) !!}
+@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')
@@ -65,8 +67,12 @@
{{ formatRp($job->price) }} |
{{-- {{ $job->worker->name }} | --}}
+ @can('view', $job)
{!! html_link_to_route('jobs.show', '',[$job->id],['icon' => 'search', 'title' => 'Lihat ' . trans('job.show'), 'class' => 'btn btn-info btn-xs','id' => 'show-job-' . $job->id]) !!}
+ @endcan
+ @can('edit', $job)
{!! html_link_to_route('jobs.edit', '',[$job->id],['icon' => 'edit', 'title' => trans('job.edit'), 'class' => 'btn btn-warning btn-xs']) !!}
+ @endcan
|
@empty
diff --git a/resources/views/projects/show.blade.php b/resources/views/projects/show.blade.php
index de2b179..c10ff65 100755
--- a/resources/views/projects/show.blade.php
+++ b/resources/views/projects/show.blade.php
@@ -1,7 +1,9 @@
@extends('layouts.project')
@section('action-buttons')
-{!! link_to_route('projects.edit', trans('project.edit'), [$project->id], ['class' => 'btn btn-warning']) !!}
+@can('update', $project)
+ {!! link_to_route('projects.edit', trans('project.edit'), [$project->id], ['class' => 'btn btn-warning']) !!}
+@endcan
{!! link_to_route('projects.index', trans('project.back_to_index'), ['status' => $project->status_id], ['class' => 'btn btn-default']) !!}
@endsection
diff --git a/routes/web.php b/routes/web.php
index 5c070aa..af077c8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -11,7 +11,7 @@ require __DIR__.'/web/invoices.php';
require __DIR__.'/web/options-vue.php';
require __DIR__.'/web/calendar.php';
-Route::group(['middleware' => ['web', 'auth']], function () {
+Route::group(['middleware' => ['role:admin']], function () {
/*
* Subscriptions Routes
*/
diff --git a/routes/web/projects.php b/routes/web/projects.php
index c9bac00..cf04e83 100644
--- a/routes/web/projects.php
+++ b/routes/web/projects.php
@@ -1,6 +1,6 @@
['web', 'role:admin'], 'namespace' => 'Projects'], function () {
+Route::group(['middleware' => ['auth'], 'namespace' => 'Projects'], function () {
/*
* Projects Routes
*/
@@ -54,7 +54,7 @@ Route::group(['middleware' => ['web', 'role:admin'], 'namespace' => 'Projects'],
Route::patch('files/{file}', ['as' => 'files.update', 'uses' => 'FilesController@update']);
});
-Route::group(['middleware' => ['web', 'auth']], function () {
+Route::group(['middleware' => ['auth']], function () {
/*
* Jobs Routes
@@ -63,7 +63,7 @@ Route::group(['middleware' => ['web', 'auth']], function () {
Route::get('jobs/{job}', ['as' => 'jobs.show', 'uses' => 'JobsController@show']);
});
-Route::group(['middleware' => ['web', 'role:admin']], function () {
+Route::group(['middleware' => ['auth']], function () {
/*
* Job Actions Routes