diff --git a/ProcessMaker/Http/Controllers/RequestController.php b/ProcessMaker/Http/Controllers/RequestController.php index b4924debc7..d36004d1e0 100644 --- a/ProcessMaker/Http/Controllers/RequestController.php +++ b/ProcessMaker/Http/Controllers/RequestController.php @@ -45,7 +45,7 @@ public function index($type = null) $this->authorize('view-all_requests'); } - $title = 'My Cases'; + $title = 'My Request'; $types = ['all'=>'All Requests', 'in_progress'=>'Requests In Progress', 'completed'=>'Completed Requests']; diff --git a/ProcessMaker/Http/Middleware/GenerateMenus.php b/ProcessMaker/Http/Middleware/GenerateMenus.php index 2105da72fb..f356958d03 100644 --- a/ProcessMaker/Http/Middleware/GenerateMenus.php +++ b/ProcessMaker/Http/Middleware/GenerateMenus.php @@ -36,10 +36,10 @@ public function handle(Request $request, Closure $next) ['route' => 'process.browser.index', 'id' => 'process-browser'] )->active('process-browser/*'); }); - $menu->group(['prefix' => 'requests'], function ($request_items) { + $menu->group(['prefix' => 'cases'], function ($request_items) { $request_items->add( __('Cases'), - ['route' => 'cases.index', 'id' => 'requests'] + ['route' => 'cases-main.index', 'id' => 'cases'] )->active('cases/*'); }); //@TODO change the index to the correct blade @@ -141,21 +141,21 @@ public function handle(Request $request, Closure $next) }); Menu::make('sidebar_request', function ($menu) { $submenu = $menu->add(__('Cases')); - $submenu->add(__('My Cases'), [ - 'route' => ['cases_by_type', ''], + $submenu->add(__('My Requests'), [ + 'route' => ['requests_by_type', ''], 'icon' => 'fa-id-badge', ]); $submenu->add(__('In Progress'), [ - 'route' => ['cases_by_type', 'in_progress'], + 'route' => ['requests_by_type', 'in_progress'], 'icon' => 'fa-clipboard-list', ]); $submenu->add(__('Completed'), [ - 'route' => ['cases_by_type', 'completed'], + 'route' => ['requests_by_type', 'completed'], 'icon' => 'fa-clipboard-check', ]); if (\Auth::check() && \Auth::user()->can('view-all_requests')) { - $submenu->add(__('All Cases'), [ - 'route' => ['cases_by_type', 'all'], + $submenu->add(__('All Requests'), [ + 'route' => ['requests_by_type', 'all'], 'icon' => 'fa-clipboard', ]); } diff --git a/resources/jscomposition/cases/casesMain/utils/counters.js b/resources/jscomposition/cases/casesMain/utils/counters.js index 84569e2e9b..689831d8c1 100644 --- a/resources/jscomposition/cases/casesMain/utils/counters.js +++ b/resources/jscomposition/cases/casesMain/utils/counters.js @@ -37,7 +37,7 @@ export const formatCounters = (data) => { color: "gray", icon: "fas fa-play", url: () => { - window.location.href = "/cases"; + window.location.href = "/requests"; }, }, ]; diff --git a/resources/views/requests/index.blade.php b/resources/views/requests/index.blade.php index 4ee1c39b49..951e9c72d9 100644 --- a/resources/views/requests/index.blade.php +++ b/resources/views/requests/index.blade.php @@ -10,7 +10,7 @@ @section('breadcrumbs') @include('shared.breadcrumbs', ['routes' => [ - __('Cases') => route('requests.index'), + __('Requests') => route('requests.index'), function() use ($title) { return [__($title), null]; } ]]) @endsection @@ -22,21 +22,21 @@ function() use ($title) { return [__($title), null]; } @@ -44,9 +44,9 @@ function() use ($title) { return [__($title), null]; } @endcan diff --git a/routes/api.php b/routes/api.php index 4e55539bbe..76f8a91b36 100644 --- a/routes/api.php +++ b/routes/api.php @@ -213,7 +213,7 @@ Route::get('/tasks/rule-execution-log', [InboxRulesController::class, 'executionLog'])->name('inboxrules.execution-log'); // Cases - Route::get('cases', [ProcessRequestController::class, 'index'])->name('cases.index'); + //Route::get('cases', [ProcessRequestController::class, 'index'])->name('cases.index'); // Requests Route::get('requests', [ProcessRequestController::class, 'index'])->name('requests.index'); // Already filtered in controller Route::get('requests/{process}/count', [ProcessRequestController::class, 'getCount'])->name('requests.count'); diff --git a/routes/web.php b/routes/web.php index 34ff8cdbc8..58c7f94ded 100644 --- a/routes/web.php +++ b/routes/web.php @@ -17,6 +17,7 @@ use ProcessMaker\Http\Controllers\Auth\LoginController; use ProcessMaker\Http\Controllers\Auth\ResetPasswordController; use ProcessMaker\Http\Controllers\Auth\TwoFactorAuthController; +use ProcessMaker\Http\Controllers\CasesController; use ProcessMaker\Http\Controllers\Designer\DesignerController; use ProcessMaker\Http\Controllers\HomeController; use ProcessMaker\Http\Controllers\InboxRulesController; @@ -32,7 +33,6 @@ use ProcessMaker\Http\Controllers\ProcessesCatalogueController; use ProcessMaker\Http\Controllers\ProfileController; use ProcessMaker\Http\Controllers\RequestController; -use ProcessMaker\Http\Controllers\CasesController; use ProcessMaker\Http\Controllers\Saml\MetadataController; use ProcessMaker\Http\Controllers\TaskController; use ProcessMaker\Http\Controllers\TemplateController; @@ -136,7 +136,7 @@ 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', [CasesController::class, 'index'])->name('cases.index')->middleware('no-cache'); Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit'); // This is a temporary API the engine team will create the API Route::get('cases-main/{type?}', [CasesController::class, 'index'])->name('cases-main.index') @@ -146,13 +146,11 @@ ->where('type', 'all|in_progress|completed') ->middleware('no-cache'); // Requests - 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', [RequestController::class, 'index']) + ->name('requests.index') + ->middleware('no-cache'); + Route::get('requests/{type?}', [RequestController::class, 'index']) + ->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');