From f46c7e4da3ad385d92a01ac12a95b5b5e3ff13ec Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Fri, 1 Dec 2023 14:36:04 -0400 Subject: [PATCH 1/4] feature/FOUR-12645 --- .../ProcessesCatalogueController.php | 5 ++- .../components/Breadcrumbs.vue | 19 ++++++-- .../components/ProcessInfo.vue | 45 ++++++++++++++++--- .../components/ProcessesCatalogue.vue | 6 ++- .../views/processes-catalogue/open.blade.php | 1 + 5 files changed, 63 insertions(+), 13 deletions(-) diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php index e237d349c7..b5a6f7ea11 100644 --- a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php +++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php @@ -20,8 +20,9 @@ public function index(Request $request) * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ - public function open(Process $process) + public function open(Process $process, Request $request) { - return view('processes-catalogue.open', compact('process')); + $category = $request->input('category') ?? 0; + return view('processes-catalogue.open', compact('process', 'category')); } } diff --git a/resources/js/processes-catalogue/components/Breadcrumbs.vue b/resources/js/processes-catalogue/components/Breadcrumbs.vue index 6b6a93ab38..a4c8013bbd 100644 --- a/resources/js/processes-catalogue/components/Breadcrumbs.vue +++ b/resources/js/processes-catalogue/components/Breadcrumbs.vue @@ -14,8 +14,8 @@ @@ -29,14 +29,27 @@ diff --git a/resources/js/processes-catalogue/components/ProcessInfo.vue b/resources/js/processes-catalogue/components/ProcessInfo.vue index e0ad61c235..5fe9030866 100644 --- a/resources/js/processes-catalogue/components/ProcessInfo.vue +++ b/resources/js/processes-catalogue/components/ProcessInfo.vue @@ -1,17 +1,18 @@ diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue index 3a5f0b06a4..8c4cdd418b 100644 --- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue +++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue @@ -1,6 +1,9 @@