Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/js/tasks/components/TasksList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ export default {
},
{
value: "showRequestSummary",
content: "Open Case",
content: "Open Request",
icon: "fas fa-clipboard",
link: true,
href: "/requests/{{process_request.id}}",
Expand Down
19 changes: 9 additions & 10 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,21 +136,20 @@
Route::post('/keep-alive', [LoginController::class, 'keepAlive'])->name('keep-alive');
// Cases
Route::get('cases', [RequestController::class, 'index'])->name('cases.index')->middleware('no-cache');
Route::get('cases/{request}', [RequestController::class, 'show'])->name('cases.show');
Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type')
->where('type', 'all|in_progress|completed')
->middleware('no-cache');
// Requests
Route::get('requests/search', [RequestController::class, 'search'])->name('requests.search');
Route::get('requests/{type?}', [RequestController::class, 'index'])
->where('type', 'all|in_progress|completed')
->name('requests_by_type')
->middleware('no-cache');
Route::get('request/{request}/files/{media}', [RequestController::class, 'downloadFiles'])->middleware('can:view,request');
Route::get('requests', [RequestController::class, 'index'])
->name('requests.index')
->middleware('no-cache');
Route::get('requests', function () {
return redirect()->route('cases.index');
})->name('requests.index')->middleware('no-cache');
Route::get('requests/{type?}', function ($type = null) {
return redirect()->route('cases_by_type', ['type' => $type]);
})->where('type', 'all|in_progress|completed')->name('requests_by_type')->middleware('no-cache');

Route::get('requests/{request}', [RequestController::class, 'show'])->name('requests.show');
Route::get('request/{request}/files/{media}', [RequestController::class, 'downloadFiles'])->middleware('can:view,request');
Route::get('requests/search', [RequestController::class, 'search'])->name('requests.search');
Route::get('requests/mobile/{request}', [RequestController::class, 'show'])->name('requests.showMobile');
Route::get('requests/{request}/task/{task}/screen/{screen}', [RequestController::class, 'screenPreview'])->name('requests.screen-preview');

Expand Down
4 changes: 2 additions & 2 deletions tests/Feature/RedirectTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ public function test401RedirectsToLogin()
'is_administrator' => false,
]);
Auth::login($user);
$response = $this->get('/requests');
$response = $this->get('/cases');
$response->assertStatus(200);
$response->assertViewIs('requests.index');
Auth::logoutCurrentDevice();
$response = $this->get('/requests');
$response = $this->get('/cases');
//302 because we want to make sure they are being redirected
$response->assertStatus(302);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/RequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class RequestTest extends TestCase
public function testIndexRoute()
{
// get the URL
$response = $this->webCall('GET', '/requests');
$response = $this->webCall('GET', '/cases');
$response->assertStatus(200);
// check the correct view is called
$response->assertViewIs('requests.index');
Expand Down