From 19071f5cf8b6046aac61febe97c8616995d7385c Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Wed, 8 Aug 2018 21:46:04 +0800 Subject: [PATCH 1/5] Add Job comments --- app/Http/Controllers/Jobs/CommentsController.php | 82 ++++++++++++++++ app/Http/Controllers/JobsController.php | 9 +- app/Policies/Projects/JobPolicy.php | 27 ++++++ resources/lang/id/comment.php | 6 +- .../views/jobs/partials/comment-section.blade.php | 32 +++++++ resources/views/jobs/show.blade.php | 39 ++++++++ routes/web.php | 2 +- routes/web/projects.php | 10 +- tests/Feature/Projects/JobCommentsTest.php | 104 +++++++++++++++++++++ tests/Unit/Policies/JobPolicyTest.php | 30 +++++- 10 files changed, 332 insertions(+), 9 deletions(-) create mode 100644 app/Http/Controllers/Jobs/CommentsController.php create mode 100644 resources/views/jobs/partials/comment-section.blade.php create mode 100644 tests/Feature/Projects/JobCommentsTest.php diff --git a/app/Http/Controllers/Jobs/CommentsController.php b/app/Http/Controllers/Jobs/CommentsController.php new file mode 100644 index 0000000..409ae04 --- /dev/null +++ b/app/Http/Controllers/Jobs/CommentsController.php @@ -0,0 +1,82 @@ +authorize('comment-on', $job); + + $newComment = $request->validate([ + 'body' => 'required|string|max:255', + ]); + + $job->comments()->create([ + 'body' => $newComment['body'], + 'creator_id' => auth()->id(), + ]); + + flash(__('comment.created'), 'success'); + + return back(); + } + + /** + * Update the specified comment. + * + * @param \Illuminate\Http\Request $request + * @param \App\Entities\Projects\Job $job + * @param \App\Entities\Jobs\Comment $comment + * @return \Illuminate\Http\Response + */ + public function update(Request $request, Job $job, Comment $comment) + { + $this->authorize('update', $comment); + + $commentData = $request->validate([ + 'body' => 'required|string|max:255', + ]); + $comment->update($commentData); + flash(__('comment.updated'), 'success'); + + return redirect()->route('jobs.show', [$job] + request(['page'])); + } + + /** + * Remove the specified comment. + * + * @param \App\Entities\Jobs\Comment $comment + * @return \Illuminate\Routing\Redirector + */ + public function destroy(Job $job, Comment $comment) + { + $this->authorize('delete', $comment); + + request()->validate([ + 'comment_id' => 'required|exists:comments,id', + ]); + + if (request('comment_id') == $comment->id && $comment->delete()) { + $routeParam = [$job] + request(['page']); + flash(__('comment.deleted'), 'warning'); + + return redirect()->route('jobs.show', $routeParam); + } + flash(__('comment.undeleted'), 'error'); + + return back(); + } +} diff --git a/app/Http/Controllers/JobsController.php b/app/Http/Controllers/JobsController.php index f5dbe36..35fbc23 100755 --- a/app/Http/Controllers/JobsController.php +++ b/app/Http/Controllers/JobsController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use App\Entities\Projects\Job; +use App\Entities\Projects\Comment; use App\Entities\Projects\Project; use App\Entities\Projects\JobsRepository; use App\Http\Requests\Jobs\DeleteRequest; @@ -65,6 +66,8 @@ class JobsController extends Controller $this->authorize('view', $job); $editableTask = null; + $editableComment = null; + $comments = $job->comments()->with('creator')->latest()->paginate(); if ($request->get('action') == 'task_edit' && $request->has('task_id')) { $editableTask = $this->repo->requireTaskById($request->get('task_id')); @@ -74,7 +77,11 @@ class JobsController extends Controller $editableTask = $this->repo->requireTaskById($request->get('task_id')); } - return view('jobs.show', compact('job', 'editableTask')); + if (request('action') == 'comment-edit' && request('comment_id') != null) { + $editableComment = Comment::find(request('comment_id')); + } + + return view('jobs.show', compact('job', 'editableTask', 'comments', 'editableComment')); } /** diff --git a/app/Policies/Projects/JobPolicy.php b/app/Policies/Projects/JobPolicy.php index 3806e78..5e27101 100644 --- a/app/Policies/Projects/JobPolicy.php +++ b/app/Policies/Projects/JobPolicy.php @@ -80,4 +80,31 @@ class JobPolicy { return $user->hasRole('admin'); } + + /** + * Determine whether the user can view job comments. + * + * @param \App\Entities\Users\User $user + * @param \App\Entities\Projects\Job $job + * @return bool + */ + public function viewComments(User $user, Job $job) + { + // Admin and job workers can commenting on their job. + return $user->hasRole('admin') + || ($user->hasRole('worker') && $job->worker_id == $user->id); + } + + /** + * Determine whether the user can add comment to a job. + * + * @param \App\Entities\Users\User $user + * @param \App\Entities\Projects\Job $job + * @return bool + */ + public function commentOn(User $user, Job $job) + { + // Admin and job workers can commenting on their job. + return $this->viewComments($user, $job); + } } diff --git a/resources/lang/id/comment.php b/resources/lang/id/comment.php index b20b834..95a1586 100644 --- a/resources/lang/id/comment.php +++ b/resources/lang/id/comment.php @@ -15,9 +15,9 @@ return [ 'updated' => 'Update data Komentar telah berhasil.', 'delete' => 'Hapus Komentar', 'delete_confirm' => 'Anda yakin akan menghapus Komentar ini?', - 'deleted' => 'Hapus data Komentar telah berhasil.', - 'undeleted' => 'Data Komentar gagal dihapus.', - 'undeleteable' => 'Data Komentar tidak dapat dihapus.', + 'deleted' => 'Komentar berhasil dihapus.', + 'undeleted' => 'Komentar gagal dihapus.', + 'undeleteable' => 'Komentar tidak dapat dihapus.', // Attributes 'body' => 'Komentar', diff --git a/resources/views/jobs/partials/comment-section.blade.php b/resources/views/jobs/partials/comment-section.blade.php new file mode 100644 index 0000000..6f5b042 --- /dev/null +++ b/resources/views/jobs/partials/comment-section.blade.php @@ -0,0 +1,32 @@ +@can('comment-on', $job) +{{ Form::open(['route' => ['jobs.comments.store', $job]]) }} +
+
{!! FormField::textarea('body', ['required' => true, 'label' => false, 'placeholder' => __('comment.create_text')]) !!}
+
+ {{ Form::submit(__('comment.create'), ['class' => 'btn btn-success btn-block']) }}
+
+
+{{ Form::close() }} +@endcan +@foreach($comments as $comment) +
+ + {{ $comment->time_display }} + {{ $comment->creator->name }} + +
+ @can('update', $comment) + {{ link_to_route('jobs.show', __('app.edit'), [$job, 'action' => 'comment-edit', 'comment_id' => $comment->id], ['id' => 'edit-comment-'.$comment->id, 'class' => 'small', 'title' => __('comment.edit')]) }} + @endcan + @can('delete', $comment) + {!! FormField::delete( + ['route' => ['jobs.comments.destroy', $job, $comment], 'class' => ''], + '×', + ['class' => 'btn-link', 'id' => 'delete-comment-'.$comment->id], + ['comment_id' => $comment->id, 'page' => request('page')] + ) !!} + @endcan +
+ {!! nl2br($comment->body) !!} +
+@endforeach diff --git a/resources/views/jobs/show.blade.php b/resources/views/jobs/show.blade.php index 051d4b2..e3062e6 100755 --- a/resources/views/jobs/show.blade.php +++ b/resources/views/jobs/show.blade.php @@ -29,6 +29,39 @@
@include('jobs.partials.job-tasks') + @can('view-comments', $job) +
+
+ {{ $comments->links() }} + @include('jobs.partials.comment-section') + {{ $comments->links() }} +
+
+ + @if (Request::get('action') == 'comment-edit' && $editableComment) + + @endif + @endcan
@endsection @@ -50,6 +83,7 @@ width: 8px; height: 8px; } + ul.pagination { margin-top: 0px } @endsection @@ -66,6 +100,11 @@ var ap_weight = e.currentTarget.value; $('#ap_weight').text(ap_weight); }); + + $('#commentModal').modal({ + show: true, + backdrop: 'static', + }); })(); @endsection diff --git a/routes/web.php b/routes/web.php index e7922bc..429f139 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,5 +1,5 @@ loginUsingId(1); require __DIR__.'/web/pages.php'; require __DIR__.'/web/users.php'; require __DIR__.'/web/references.php'; diff --git a/routes/web/projects.php b/routes/web/projects.php index 239b4ff..64b4a41 100644 --- a/routes/web/projects.php +++ b/routes/web/projects.php @@ -69,9 +69,6 @@ Route::group(['middleware' => ['auth']], function () { */ Route::get('jobs', ['as' => 'jobs.index', 'uses' => 'JobsController@index']); Route::get('jobs/{job}', ['as' => 'jobs.show', 'uses' => 'JobsController@show']); -}); - -Route::group(['middleware' => ['auth']], function () { /* * Job Actions Routes @@ -81,4 +78,11 @@ Route::group(['middleware' => ['auth']], function () { Route::get('jobs/{job}/delete', ['as' => 'jobs.delete', 'uses' => 'JobsController@delete']); Route::delete('jobs/{job}', ['as' => 'jobs.destroy', 'uses' => 'JobsController@destroy']); Route::post('jobs/{id}/tasks-reorder', ['as' => 'jobs.tasks-reorder', 'uses' => 'JobsController@tasksReorder']); + + /* + * Project Comments Routes + */ + Route::post('jobs/{job}/comments', 'Jobs\CommentsController@store')->name('jobs.comments.store'); + Route::patch('jobs/{job}/comments/{comment}', 'Jobs\CommentsController@update')->name('jobs.comments.update'); + Route::delete('jobs/{job}/comments/{comment}', 'Jobs\CommentsController@destroy')->name('jobs.comments.destroy'); }); diff --git a/tests/Feature/Projects/JobCommentsTest.php b/tests/Feature/Projects/JobCommentsTest.php new file mode 100644 index 0000000..8ecd4c2 --- /dev/null +++ b/tests/Feature/Projects/JobCommentsTest.php @@ -0,0 +1,104 @@ +adminUserSigningIn(); + $job = factory(Job::class)->create(); + $comment = factory(Comment::class)->create([ + 'commentable_type' => 'jobs', + 'commentable_id' => $job->id, + 'body' => 'This is job comment.', + ]); + + $this->visitRoute('jobs.show', $job); + $this->seeRouteIs('jobs.show', $job); + + $this->seeText('This is job comment.'); + } + + /** @test */ + public function admin_can_add_comment_to_a_job() + { + $admin = $this->adminUserSigningIn(); + $job = factory(Job::class)->create(); + + $this->visitRoute('jobs.show', $job); + + $this->submitForm(__('comment.create'), [ + 'body' => 'Komentar pertama.', + ]); + + $this->seePageIs(route('jobs.show', $job)); + $this->see(__('comment.created')); + + $this->seeInDatabase('comments', [ + 'commentable_type' => 'jobs', + 'commentable_id' => $job->id, + 'body' => 'Komentar pertama.', + 'creator_id' => $admin->id, + ]); + } + + /** @test */ + public function user_can_edit_comment() + { + $this->adminUserSigningIn(); + $job = factory(Job::class)->create(); + $comment = factory(Comment::class)->create([ + 'commentable_type' => 'jobs', + 'commentable_id' => $job->id, + 'body' => 'This is job comment.', + ]); + + $this->visitRoute('jobs.show', $job); + $this->seeElement('a', ['id' => 'edit-comment-'.$comment->id]); + $this->click('edit-comment-'.$comment->id); + $this->seeRouteIs('jobs.show', [$job, 'action' => 'comment-edit', 'comment_id' => $comment->id]); + + $this->submitForm(__('comment.update'), [ + 'body' => 'Komentar pertama.', + ]); + + $this->seePageIs(route('jobs.show', $job)); + $this->see(__('comment.updated')); + + $this->seeInDatabase('comments', [ + 'id' => $comment->id, + 'commentable_type' => 'jobs', + 'commentable_id' => $job->id, + 'body' => 'Komentar pertama.', + ]); + } + + /** @test */ + public function user_can_delete_comment() + { + $this->adminUserSigningIn(); + $job = factory(Job::class)->create(); + $comment = factory(Comment::class)->create([ + 'commentable_type' => 'jobs', + 'commentable_id' => $job->id, + 'body' => 'This is job comment.', + ]); + + $this->visitRoute('jobs.show', $job); + $this->seeElement('button', ['id' => 'delete-comment-'.$comment->id]); + $this->press('delete-comment-'.$comment->id); + + $this->seePageIs(route('jobs.show', $job)); + $this->see(__('comment.deleted')); + + $this->dontSeeInDatabase('comments', [ + 'id' => $comment->id, + ]); + } +} diff --git a/tests/Unit/Policies/JobPolicyTest.php b/tests/Unit/Policies/JobPolicyTest.php index 6b985a1..056b177 100644 --- a/tests/Unit/Policies/JobPolicyTest.php +++ b/tests/Unit/Policies/JobPolicyTest.php @@ -2,8 +2,8 @@ namespace Tests\Unit\Policies; +use Tests\TestCase; use App\Entities\Projects\Job; -use Tests\TestCase as TestCase; class JobPolicyTest extends TestCase { @@ -81,4 +81,32 @@ class JobPolicyTest extends TestCase $this->assertTrue($admin->can('see-pricings', $job)); $this->assertFalse($worker->can('see-pricings', $job)); } + + /** @test */ + public function admin_and_worker_view_job_comment_list() + { + $admin = $this->createUser('admin'); + $worker = $this->createUser('worker'); + + $job = factory(Job::class)->create([ + 'worker_id' => $worker->id, + ]); + + $this->assertTrue($admin->can('view-comments', $job)); + $this->assertTrue($worker->can('view-comments', $job)); + } + + /** @test */ + public function admin_and_job_workers_can_add_comment_to_job() + { + $admin = $this->createUser('admin'); + $worker = $this->createUser('worker'); + + $job = factory(Job::class)->create([ + 'worker_id' => $worker->id, + ]); + + $this->assertTrue($admin->can('comment-on', $job)); + $this->assertTrue($worker->can('comment-on', $job)); + } } From a18cd4993cf17fa988503a1a6479ca091098ac20 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Fri, 10 Aug 2018 08:59:06 +0800 Subject: [PATCH 2/5] Update job detail layout Add job view layout Add nav-tabs on job detail page Update job show view to extends job layout Add job comments view that extends job layout --- app/Http/Controllers/Jobs/CommentsController.php | 24 ++++++++- resources/views/jobs/comments.blade.php | 54 +++++++++++++++++++ .../views/jobs/partials/comment-section.blade.php | 2 +- resources/views/jobs/partials/nav-tabs.blade.php | 12 +++++ resources/views/jobs/show.blade.php | 60 ++++------------------ resources/views/layouts/job.blade.php | 22 ++++++++ routes/web/projects.php | 1 + tests/Feature/Projects/JobCommentsTest.php | 18 +++---- 8 files changed, 132 insertions(+), 61 deletions(-) create mode 100755 resources/views/jobs/comments.blade.php create mode 100644 resources/views/jobs/partials/nav-tabs.blade.php create mode 100755 resources/views/layouts/job.blade.php diff --git a/app/Http/Controllers/Jobs/CommentsController.php b/app/Http/Controllers/Jobs/CommentsController.php index 409ae04..2fc978b 100644 --- a/app/Http/Controllers/Jobs/CommentsController.php +++ b/app/Http/Controllers/Jobs/CommentsController.php @@ -10,6 +10,26 @@ use App\Http\Controllers\Controller; class CommentsController extends Controller { /** + * Display a listing of the job comments. + * + * @param \App\Entities\Projects\Job $job + * @return \Illuminate\View\View + */ + public function index(Job $job) + { + $this->authorize('view-comments', $job); + + $editableComment = null; + $comments = $job->comments()->with('creator')->latest()->paginate(); + + if (request('action') == 'comment-edit' && request('comment_id') != null) { + $editableComment = Comment::find(request('comment_id')); + } + + return view('jobs.comments', compact('job', 'comments', 'editableComment')); + } + + /** * Store a new comment in storage. * * @param \Illuminate\Http\Request $request @@ -52,7 +72,7 @@ class CommentsController extends Controller $comment->update($commentData); flash(__('comment.updated'), 'success'); - return redirect()->route('jobs.show', [$job] + request(['page'])); + return redirect()->route('jobs.comments.index', [$job] + request(['page'])); } /** @@ -73,7 +93,7 @@ class CommentsController extends Controller $routeParam = [$job] + request(['page']); flash(__('comment.deleted'), 'warning'); - return redirect()->route('jobs.show', $routeParam); + return redirect()->route('jobs.comments.index', $routeParam); } flash(__('comment.undeleted'), 'error'); diff --git a/resources/views/jobs/comments.blade.php b/resources/views/jobs/comments.blade.php new file mode 100755 index 0000000..df0c010 --- /dev/null +++ b/resources/views/jobs/comments.blade.php @@ -0,0 +1,54 @@ +@extends('layouts.job') + +@section('subtitle', __('comment.list')) + +@section('content-job') +
+
+ {{ $comments->links() }} + @include('jobs.partials.comment-section') + {{ $comments->links() }} +
+
+ +@if (Request::get('action') == 'comment-edit' && $editableComment) + +@endif +@endsection + +@section('ext_css') + +@endsection + +@section('script') + +@endsection diff --git a/resources/views/jobs/partials/comment-section.blade.php b/resources/views/jobs/partials/comment-section.blade.php index 6f5b042..88809c8 100644 --- a/resources/views/jobs/partials/comment-section.blade.php +++ b/resources/views/jobs/partials/comment-section.blade.php @@ -16,7 +16,7 @@
@can('update', $comment) - {{ link_to_route('jobs.show', __('app.edit'), [$job, 'action' => 'comment-edit', 'comment_id' => $comment->id], ['id' => 'edit-comment-'.$comment->id, 'class' => 'small', 'title' => __('comment.edit')]) }} + {{ link_to_route('jobs.comments.index', __('app.edit'), [$job, 'action' => 'comment-edit', 'comment_id' => $comment->id], ['id' => 'edit-comment-'.$comment->id, 'class' => 'small', 'title' => __('comment.edit')]) }} @endcan @can('delete', $comment) {!! FormField::delete( diff --git a/resources/views/jobs/partials/nav-tabs.blade.php b/resources/views/jobs/partials/nav-tabs.blade.php new file mode 100644 index 0000000..e1fb60e --- /dev/null +++ b/resources/views/jobs/partials/nav-tabs.blade.php @@ -0,0 +1,12 @@ + +
    +
  • + {!! link_to_route('jobs.show', __('job.detail'), $job) !!} +
    • + @can('view-comments', $job) +
  • + {!! link_to_route('jobs.comments.index', __('comment.list').' ('.$job->comments->count().')', $job) !!} +
    • + @endcan +
+
diff --git a/resources/views/jobs/show.blade.php b/resources/views/jobs/show.blade.php index e3062e6..f3ae9ec 100755 --- a/resources/views/jobs/show.blade.php +++ b/resources/views/jobs/show.blade.php @@ -1,22 +1,17 @@ -@extends('layouts.app') +@extends('layouts.job') -@section('title', __('job.detail') . ' | ' . $job->name . ' | ' . $job->project->name) +@section('subtitle', __('job.detail')) -@section('content') -@include('jobs.partials.breadcrumb') +@section('action-buttons') +@can('create', new App\Entities\Projects\Job) + {!! html_link_to_route('projects.jobs.create', __('job.create'), [$job->project_id], ['class' => 'btn btn-success','icon' => 'plus']) !!} +@endcan +@can('update', $job) + {{ link_to_route('jobs.edit', __('job.edit'), [$job], ['class' => 'btn btn-warning']) }} +@endcan +@endsection +@section('content-job') -

-
- @can('create', new App\Entities\Projects\Job) - {!! html_link_to_route('projects.jobs.create', __('job.create'), [$job->project_id], ['class' => 'btn btn-success','icon' => 'plus']) !!} - @endcan - @can('update', $job) - {{ link_to_route('jobs.edit', __('job.edit'), [$job], ['class' => 'btn btn-warning']) }} - @endcan - {{ link_to_route('projects.jobs.index', __('job.back_to_index'), [$job->project_id, '#' . $job->id], ['class' => 'btn btn-default']) }} -
- {{ $job->name }} {{ __('job.detail') }} -

@include('jobs.partials.job-show') @@ -29,39 +24,6 @@
@include('jobs.partials.job-tasks') - @can('view-comments', $job) -
-
- {{ $comments->links() }} - @include('jobs.partials.comment-section') - {{ $comments->links() }} -
-
- - @if (Request::get('action') == 'comment-edit' && $editableComment) - - @endif - @endcan
@endsection diff --git a/resources/views/layouts/job.blade.php b/resources/views/layouts/job.blade.php new file mode 100755 index 0000000..302dc99 --- /dev/null +++ b/resources/views/layouts/job.blade.php @@ -0,0 +1,22 @@ +@extends('layouts.app') + +@section('title') +@yield('subtitle', __('job.detail')) - {{ $job->name }} +@endsection + +@section('content') +@include('jobs.partials.breadcrumb') + +

+
+ @yield('action-buttons') + {{ link_to_route('projects.jobs.index', __('job.back_to_index'), [$job->project_id, '#' . $job->id], ['class' => 'btn btn-default']) }} +
+ {{ $job->name }} @yield('subtitle', __('job.detail')) +

+ +@include('jobs.partials.nav-tabs') + +@yield('content-job') + +@endsection diff --git a/routes/web/projects.php b/routes/web/projects.php index 64b4a41..949d7fc 100644 --- a/routes/web/projects.php +++ b/routes/web/projects.php @@ -82,6 +82,7 @@ Route::group(['middleware' => ['auth']], function () { /* * Project Comments Routes */ + Route::get('jobs/{job}/comments', 'Jobs\CommentsController@index')->name('jobs.comments.index'); Route::post('jobs/{job}/comments', 'Jobs\CommentsController@store')->name('jobs.comments.store'); Route::patch('jobs/{job}/comments/{comment}', 'Jobs\CommentsController@update')->name('jobs.comments.update'); Route::delete('jobs/{job}/comments/{comment}', 'Jobs\CommentsController@destroy')->name('jobs.comments.destroy'); diff --git a/tests/Feature/Projects/JobCommentsTest.php b/tests/Feature/Projects/JobCommentsTest.php index 8ecd4c2..4263a42 100644 --- a/tests/Feature/Projects/JobCommentsTest.php +++ b/tests/Feature/Projects/JobCommentsTest.php @@ -19,8 +19,8 @@ class JobCommentsTest extends TestCase 'body' => 'This is job comment.', ]); - $this->visitRoute('jobs.show', $job); - $this->seeRouteIs('jobs.show', $job); + $this->visitRoute('jobs.comments.index', $job); + $this->seeRouteIs('jobs.comments.index', $job); $this->seeText('This is job comment.'); } @@ -31,13 +31,13 @@ class JobCommentsTest extends TestCase $admin = $this->adminUserSigningIn(); $job = factory(Job::class)->create(); - $this->visitRoute('jobs.show', $job); + $this->visitRoute('jobs.comments.index', $job); $this->submitForm(__('comment.create'), [ 'body' => 'Komentar pertama.', ]); - $this->seePageIs(route('jobs.show', $job)); + $this->seePageIs(route('jobs.comments.index', $job)); $this->see(__('comment.created')); $this->seeInDatabase('comments', [ @@ -59,16 +59,16 @@ class JobCommentsTest extends TestCase 'body' => 'This is job comment.', ]); - $this->visitRoute('jobs.show', $job); + $this->visitRoute('jobs.comments.index', $job); $this->seeElement('a', ['id' => 'edit-comment-'.$comment->id]); $this->click('edit-comment-'.$comment->id); - $this->seeRouteIs('jobs.show', [$job, 'action' => 'comment-edit', 'comment_id' => $comment->id]); + $this->seeRouteIs('jobs.comments.index', [$job, 'action' => 'comment-edit', 'comment_id' => $comment->id]); $this->submitForm(__('comment.update'), [ 'body' => 'Komentar pertama.', ]); - $this->seePageIs(route('jobs.show', $job)); + $this->seePageIs(route('jobs.comments.index', $job)); $this->see(__('comment.updated')); $this->seeInDatabase('comments', [ @@ -90,11 +90,11 @@ class JobCommentsTest extends TestCase 'body' => 'This is job comment.', ]); - $this->visitRoute('jobs.show', $job); + $this->visitRoute('jobs.comments.index', $job); $this->seeElement('button', ['id' => 'delete-comment-'.$comment->id]); $this->press('delete-comment-'.$comment->id); - $this->seePageIs(route('jobs.show', $job)); + $this->seePageIs(route('jobs.comments.index', $job)); $this->see(__('comment.deleted')); $this->dontSeeInDatabase('comments', [ From 312e5c18f82d7ac7db521c780bb8a666113ed292 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Fri, 10 Aug 2018 09:47:24 +0800 Subject: [PATCH 3/5] Update some job views --- resources/views/jobs/unfinished.blade.php | 2 +- .../projects/jobs/add-from-other-project.blade.php | 18 ++++---- resources/views/projects/jobs/create.blade.php | 15 +++---- resources/views/projects/jobs/index.blade.php | 52 +++++++++++----------- 4 files changed, 43 insertions(+), 44 deletions(-) diff --git a/resources/views/jobs/unfinished.blade.php b/resources/views/jobs/unfinished.blade.php index 498ca0a..74dfcae 100755 --- a/resources/views/jobs/unfinished.blade.php +++ b/resources/views/jobs/unfinished.blade.php @@ -6,7 +6,7 @@
  • {{ __('job.on_progress') }}
-
+
{{ Form::open(['method' => 'get', 'class' => 'form-inline']) }} {!! FormField::select('project_id', $projects, ['label' => __('project.select'), 'placeholder' => __('project.all')]) !!} diff --git a/resources/views/projects/jobs/add-from-other-project.blade.php b/resources/views/projects/jobs/add-from-other-project.blade.php index 94293a4..63a85b8 100755 --- a/resources/views/projects/jobs/add-from-other-project.blade.php +++ b/resources/views/projects/jobs/add-from-other-project.blade.php @@ -4,8 +4,8 @@ @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']) !!} + {!! html_link_to_route('projects.jobs.create', __('job.create'), [$project->id], ['class' => 'btn btn-success','icon' => 'plus']) !!} + {!! html_link_to_route('projects.jobs.add-from-other-project', __('job.add_from_other_project'), [$project->id], ['class' => 'btn btn-default','icon' => 'plus']) !!} @endcan @endsection @@ -21,18 +21,18 @@ {{ Form::submit(__('project.show_jobs'), ['class' => 'btn btn-default btn-sm']) }} {{ Form::close() }} @if ($selectedProject) - {!! Form::open(['route' => ['projects.jobs.store-from-other-project', $project->id]]) !!} + {{ Form::open(['route' => ['projects.jobs.store-from-other-project', $project->id]]) }}
    @forelse($selectedProject->jobs as $key => $job)
    • @foreach($job->tasks as $task)
      • @endforeach @@ -45,8 +45,8 @@ @else
      {{ __('job.select_project') }}
      @endif - {!! Form::submit(__('job.add'), ['class' => 'btn btn-primary']) !!} - {!! Form::close() !!} + {{ Form::submit(__('job.add'), ['class' => 'btn btn-primary']) }} + {{ Form::close() }}
@@ -58,7 +58,7 @@ @endsection @section('ext_css') - {!! Html::style(url('assets/css/plugins/select2.min.css')) !!} + {{ Html::style(url('assets/css/plugins/select2.min.css')) }}