diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php index ad6ceac56b..262a09f4d1 100644 --- a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php +++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php @@ -14,6 +14,7 @@ use ProcessMaker\Models\ProcessCategory; use ProcessMaker\Models\ProcessLaunchpad; use ProcessMaker\Traits\HasControllerAddons; +use ProcessMaker\Package\SavedSearch\Models\SavedSearch; /** * @param Request $request @@ -48,6 +49,27 @@ public function index(Request $request, Process $process = null) return view('processes-catalogue.mobile', compact('title', 'process', 'currentUser', 'manager')); } $userConfiguration = (new UserConfigurationController())->index()['ui_configuration']; - return view('processes-catalogue.index', compact('process', 'currentUser', 'manager', 'userConfiguration')); + + $defaultSavedSearch = $this->getDefaultSavedSearchId(); + + return view('processes-catalogue.index', compact('process', 'currentUser', 'manager', 'userConfiguration', 'defaultSavedSearch')); + } + + /** + * Get the ID of the default saved search for tasks. + * + * @return int|null + */ + private function getDefaultSavedSearchId() + { + $id = null; + if (class_exists(SavedSearch::class)) { + $savedSearch = SavedSearch::firstSystemSearchFor( + Auth::user(), + SavedSearch::KEY_TASKS, + ); + $id = $savedSearch->id; + } + return $id; } } diff --git a/README.md b/README.md index ceab37bb8d..eb9c8f9172 100644 --- a/README.md +++ b/README.md @@ -406,9 +406,9 @@ Please follow the steps: ```text npm install ``` -2. Add the new svg icon file in the /processmaker/resources/icons +2. Add the new svg icon file in the /processmaker/resources/devhub/pm-font/svg ```text -/processmaker/resources/icons/my-new-icon.svg +/processmaker/resources/devhub/pm-font/svg/my-new-icon.svg ``` 3.Run the follow command ```text diff --git a/devhub/pm-font/svg/arrow-left.svg b/devhub/pm-font/svg/arrow-left.svg new file mode 100644 index 0000000000..be836c41cf --- /dev/null +++ b/devhub/pm-font/svg/arrow-left.svg @@ -0,0 +1,3 @@ + + + diff --git a/devhub/pm-font/svg/box-arrow-up-right.svg b/devhub/pm-font/svg/box-arrow-up-right.svg new file mode 100644 index 0000000000..ef105b84ce --- /dev/null +++ b/devhub/pm-font/svg/box-arrow-up-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/fonts/pm-font/index.html b/resources/fonts/pm-font/index.html index c91af38eb9..3b551c9017 100644 --- a/resources/fonts/pm-font/index.html +++ b/resources/fonts/pm-font/index.html @@ -103,7 +103,7 @@
-

ProcessMaker Icons4.12.0

+

ProcessMaker Icons4.12.2

Icons generated with svgtofont. For add new icons, please check the README file
@@ -115,7 +115,7 @@

ProcessMaker Icons4.12.0

-

ProcessMaker Icons4.12.0

+

ProcessMaker Icons4.12.2

Icons generated with svgtofont. For add new icons, please check the README file
@@ -114,6 +114,20 @@

ProcessMaker Icons4.12.0