Browse Source

Rename project jobs routes name

pull/1/head
Nafies Luthfi 8 years ago
parent
commit
b7d4d7f81e
  1. 2
      resources/views/jobs/show.blade.php
  2. 6
      resources/views/projects/jobs/index.blade.php
  3. 4
      routes/web/projects.php
  4. 6
      tests/Feature/ManageJobsTest.php

2
resources/views/jobs/show.blade.php

@ -7,7 +7,7 @@
<h1 class="page-header">
<div class="pull-right">
{!! html_link_to_route('jobs.create', trans('job.create'), [$job->project_id], ['class' => 'btn btn-success','icon' => 'plus']) !!}
{!! html_link_to_route('projects.jobs.create', trans('job.create'), [$job->project_id], ['class' => 'btn btn-success','icon' => 'plus']) !!}
{!! link_to_route('jobs.edit', trans('job.edit'), [$job->id], ['class' => 'btn btn-warning']) !!}
{!! link_to_route('projects.jobs.index', trans('job.back_to_index'), [$job->project_id, '#' . $job->id], ['class' => 'btn btn-default']) !!}
</div>

6
resources/views/projects/jobs/index.blade.php

@ -3,15 +3,15 @@
@section('subtitle', trans('project.jobs'))
@section('action-buttons')
{!! html_link_to_route('jobs.create', trans('job.create'), [$project->id], ['class' => 'btn btn-success','icon' => 'plus']) !!}
{!! html_link_to_route('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', 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']) !!}
@endsection
@section('content-project')
@if ($jobs->isEmpty())
<p>{{ trans('project.no_jobs') }},
{{ link_to_route('jobs.create', trans('job.create'), [$project->id]) }}.
{{ link_to_route('projects.jobs.create', trans('job.create'), [$project->id]) }}.
</p>
@else

4
routes/web/projects.php

@ -29,9 +29,9 @@ Route::group(['middleware' => ['web', 'auth'], 'namespace' => 'Projects'], funct
/**
* Project Jobs Routes
*/
Route::get('projects/{id}/jobs/create', ['as' => 'jobs.create', 'uses' => 'JobsController@create']);
Route::get('projects/{id}/jobs/add-from-other-project', ['as' => 'jobs.add-from-other-project', 'uses' => 'JobsController@addFromOtherProject']);
Route::get('projects/{id}/jobs/create', ['as' => 'projects.jobs.create', 'uses' => 'JobsController@create']);
Route::post('projects/{id}/jobs', ['as' => 'projects.jobs.store', 'uses' => 'JobsController@store']);
Route::get('projects/{id}/jobs/add-from-other-project', ['as' => 'projects.jobs.add-from-other-project', 'uses' => 'JobsController@addFromOtherProject']);
Route::post('projects/{id}/jobs/store-from-other-project', ['as' => 'projects.jobs.store-from-other-project', 'uses' => 'JobsController@storeFromOtherProject']);
Route::get('jobs/{id}/delete', ['as' => 'jobs.delete', 'uses' => 'JobsController@delete']);
Route::post('jobs/{id}/tasks-reorder', ['as' => 'jobs.tasks-reorder', 'uses' => 'JobsController@tasksReorder']);

6
tests/Feature/ManageJobsTest.php

@ -28,7 +28,7 @@ class ManageJobsTest extends TestCase
$this->visit(route('projects.jobs.index', $project->id));
$this->click(trans('job.create'));
$this->seePageIs(route('jobs.create', $project->id));
$this->seePageIs(route('projects.jobs.create', $project->id));
$this->submitForm(trans('job.create'), [
'name' => 'Nama Fitur Baru',
@ -148,11 +148,11 @@ class ManageJobsTest extends TestCase
$this->visit(route('projects.jobs.index', $projects[1]->id));
$this->click(trans('job.add_from_other_project'));
$this->seePageIs(route('jobs.add-from-other-project', $projects[1]->id));
$this->seePageIs(route('projects.jobs.add-from-other-project', $projects[1]->id));
$this->select($projects[0]->id, 'project_id');
$this->press(trans('project.show_jobs'));
$this->seePageIs(route('jobs.add-from-other-project', [$projects[1]->id, 'project_id' => $projects[0]->id]));
$this->seePageIs(route('projects.jobs.add-from-other-project', [$projects[1]->id, 'project_id' => $projects[0]->id]));
$this->submitForm(trans('job.create'), [
'job_ids['.$jobs[0]->id.']' => $jobs[0]->id,

Loading…
Cancel
Save