Browse Source

Change issue pic and status update controller action

pull/37/head
Nafies Luthfi 7 years ago
parent
commit
51d16391fb
  1. 15
      app/Http/Controllers/Issues/OptionController.php
  2. 2
      resources/views/projects/issues.blade.php
  3. 2
      resources/views/projects/issues/show.blade.php
  4. 4
      routes/web/projects.php
  5. 6
      tests/Feature/Projects/ProjectIssuesTest.php

15
app/Http/Controllers/Issues/PicController.php → app/Http/Controllers/Issues/OptionController.php

@ -6,23 +6,18 @@ use Illuminate\Http\Request;
use App\Entities\Projects\Issue;
use App\Http\Controllers\Controller;
class PicController extends Controller
class OptionController extends Controller
{
public function update(Request $request, Issue $issue)
{
$picData = $request->validate([
$issueData = $request->validate([
'status_id' => 'required|in:0,1,2,3,4',
'pic_id' => 'nullable|exists:users,id',
]);
$issue->status_id = $picData['status_id'];
$issue->pic_id = $picData['pic_id'];
$issue->status_id = $issueData['status_id'];
$issue->pic_id = $issueData['pic_id'];
$issue->save();
if ($issue->pic_id) {
flash(__('issue.pic_assigned'), 'success');
} else {
flash(__('issue.pic_removed'), 'warning');
}
flash(__('issue.updated'), 'success');
return back();
}

2
resources/views/projects/issues.blade.php

@ -43,7 +43,7 @@
</td>
</tr>
@empty
<tr><td colspan="5">{{ __('issue.empty') }}</td></tr>
<tr><td colspan="6">{{ __('issue.empty') }}</td></tr>
@endforelse
</tbody>
</table>

2
resources/views/projects/issues/show.blade.php

@ -32,7 +32,7 @@
</div>
</div>
<div class="col-md-6">
{{ Form::model($issue, ['route' => ['issues.pic.update', $issue], 'method' => 'patch']) }}
{{ Form::model($issue, ['route' => ['issues.options.update', $issue], 'method' => 'patch']) }}
<div class="panel panel-default">
<div class="panel-heading"><h3 class="panel-title">{{ __('app.action') }}</h3></div>
<div class="panel-body">

4
routes/web/projects.php

@ -102,6 +102,6 @@ Route::group(['middleware' => ['auth']], function () {
});
/**
* Issue PIC Routes
* Issue Options Routes
*/
Route::patch('issues/{issue}/assign_pic', 'Issues\PicController@update')->name('issues.pic.update');
Route::patch('issues/{issue}/options', 'Issues\OptionController@update')->name('issues.options.update');

6
tests/Feature/Projects/ProjectIssuesTest.php

@ -141,7 +141,7 @@ class ProjectIssuesTest extends TestCase
'pic_id' => $worker->id,
]);
$this->seeRouteIs('projects.issues.show', [$issue->project, $issue]);
$this->seeText(__('issue.pic_assigned'));
$this->seeText(__('issue.updated'));
$this->seeInDatabase('issues', [
'id' => $issue->id,
@ -161,7 +161,7 @@ class ProjectIssuesTest extends TestCase
'pic_id' => null,
]);
$this->seeRouteIs('projects.issues.show', [$issue->project, $issue]);
$this->seeText(__('issue.pic_removed'));
$this->seeText(__('issue.updated'));
$this->seeInDatabase('issues', [
'id' => $issue->id,
@ -182,7 +182,7 @@ class ProjectIssuesTest extends TestCase
'pic_id' => $worker->id,
]);
$this->seeRouteIs('projects.issues.show', [$issue->project, $issue]);
$this->seeText(__('issue.pic_assigned'));
$this->seeText(__('issue.updated'));
$this->seeInDatabase('issues', [
'id' => $issue->id,

Loading…
Cancel
Save