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
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
use ProcessMaker\Models\Process;
use ProcessMaker\Models\ProcessCategory;
use ProcessMaker\Models\ProcessLaunchpad;
use ProcessMaker\Traits\HasControllerAddons;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use ProcessMaker\Traits\HasControllerAddons;

/**
* @param Request $request
Expand Down Expand Up @@ -70,6 +70,7 @@ private function getDefaultSavedSearchId()
);
$id = $savedSearch->id;
}

return $id;
}
}
12 changes: 8 additions & 4 deletions ProcessMaker/Http/Controllers/TaskController.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ class TaskController extends Controller

public function index()
{
$title = 'To Do Tasks';

$showOldTaskScreen = Request::path() !== 'inbox';
$routerPath = Request::route('router');

$title = 'To Do Tasks';
$path = Request::path() !== 'inbox';
$showOldTaskScreen = $path === true && $routerPath === null;
$selectedProcess = $routerPath === null ? 'inbox' : 'reload';
if (Request::input('status') == 'CLOSED') {
$title = 'Completed Tasks';
}
Expand All @@ -62,7 +64,9 @@ public function index()

$userConfiguration = (new UserConfigurationController())->index()['ui_configuration'] ?? [];

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen'));
$currentUser = Auth::user();

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen', 'currentUser', 'selectedProcess'));
}

public function edit(ProcessRequestToken $task, string $preview = '')
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Middleware/GenerateMenus.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function handle(Request $request, Closure $next)
$request_items->add(
__('Home'),
['route' => 'home', 'id' => 'home']
)->active('home/*');
)->active('home/*|inbox|inbox/*');
});
}
$menu->group(['prefix' => 'processes'], function ($request_items) {
Expand Down
3 changes: 3 additions & 0 deletions devhub/pm-font/svg/inbox.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion resources/fonts/pm-font/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h1>ProcessMaker Icons<sup>4.12.2</sup></h1>
</div>
<div class="icons">
<ul>
<li class="class-icon"><i class="fp-arrow-left"></i><p class="name">arrow-left</p></li><li class="class-icon"><i class="fp-box-arrow-up-right"></i><p class="name">box-arrow-up-right</p></li><li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-tachometer-alt-average"></i><p class="name">tachometer-alt-average</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
<li class="class-icon"><i class="fp-arrow-left"></i><p class="name">arrow-left</p></li><li class="class-icon"><i class="fp-box-arrow-up-right"></i><p class="name">box-arrow-up-right</p></li><li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-inbox"></i><p class="name">inbox</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-tachometer-alt-average"></i><p class="name">tachometer-alt-average</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
</ul>
</div>
<p class="links">
Expand Down
43 changes: 22 additions & 21 deletions resources/fonts/pm-font/processmaker-font.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1738008776900'); /* IE9*/
src: url('processmaker-font.eot?t=1738008776900#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1738008776900") format("woff2"),
url("processmaker-font.woff?t=1738008776900") format("woff"),
url('processmaker-font.ttf?t=1738008776900') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1738008776900#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1738184445914'); /* IE9*/
src: url('processmaker-font.eot?t=1738184445914#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1738184445914") format("woff2"),
url("processmaker-font.woff?t=1738184445914") format("woff"),
url('processmaker-font.ttf?t=1738184445914') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1738184445914#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand Down Expand Up @@ -45,19 +45,20 @@
.fp-folder-outline:before { content: "\ea1b"; }
.fp-fullscreen:before { content: "\ea1c"; }
.fp-github:before { content: "\ea1d"; }
.fp-layout-icon:before { content: "\ea1e"; }
.fp-map:before { content: "\ea1f"; }
.fp-mobile:before { content: "\ea20"; }
.fp-pdf:before { content: "\ea21"; }
.fp-play-outline:before { content: "\ea22"; }
.fp-plus:before { content: "\ea23"; }
.fp-screen-outline:before { content: "\ea24"; }
.fp-script-outline:before { content: "\ea25"; }
.fp-slack-notification:before { content: "\ea26"; }
.fp-slack:before { content: "\ea27"; }
.fp-slideshow:before { content: "\ea28"; }
.fp-table:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea2a"; }
.fp-trash:before { content: "\ea2b"; }
.fp-unlink:before { content: "\ea2c"; }
.fp-inbox:before { content: "\ea1e"; }
.fp-layout-icon:before { content: "\ea1f"; }
.fp-map:before { content: "\ea20"; }
.fp-mobile:before { content: "\ea21"; }
.fp-pdf:before { content: "\ea22"; }
.fp-play-outline:before { content: "\ea23"; }
.fp-plus:before { content: "\ea24"; }
.fp-screen-outline:before { content: "\ea25"; }
.fp-script-outline:before { content: "\ea26"; }
.fp-slack-notification:before { content: "\ea27"; }
.fp-slack:before { content: "\ea28"; }
.fp-slideshow:before { content: "\ea29"; }
.fp-table:before { content: "\ea2a"; }
.fp-tachometer-alt-average:before { content: "\ea2b"; }
.fp-trash:before { content: "\ea2c"; }
.fp-unlink:before { content: "\ea2d"; }

Binary file modified resources/fonts/pm-font/processmaker-font.eot
Binary file not shown.
43 changes: 22 additions & 21 deletions resources/fonts/pm-font/processmaker-font.less
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1738008776900'); /* IE9*/
src: url('processmaker-font.eot?t=1738008776900#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1738008776900") format("woff2"),
url("processmaker-font.woff?t=1738008776900") format("woff"),
url('processmaker-font.ttf?t=1738008776900') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1738008776900#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1738184445914'); /* IE9*/
src: url('processmaker-font.eot?t=1738184445914#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1738184445914") format("woff2"),
url("processmaker-font.woff?t=1738184445914") format("woff"),
url('processmaker-font.ttf?t=1738184445914') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1738184445914#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand Down Expand Up @@ -43,18 +43,19 @@
.fp-folder-outline:before { content: "\ea1b"; }
.fp-fullscreen:before { content: "\ea1c"; }
.fp-github:before { content: "\ea1d"; }
.fp-layout-icon:before { content: "\ea1e"; }
.fp-map:before { content: "\ea1f"; }
.fp-mobile:before { content: "\ea20"; }
.fp-pdf:before { content: "\ea21"; }
.fp-play-outline:before { content: "\ea22"; }
.fp-plus:before { content: "\ea23"; }
.fp-screen-outline:before { content: "\ea24"; }
.fp-script-outline:before { content: "\ea25"; }
.fp-slack-notification:before { content: "\ea26"; }
.fp-slack:before { content: "\ea27"; }
.fp-slideshow:before { content: "\ea28"; }
.fp-table:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea2a"; }
.fp-trash:before { content: "\ea2b"; }
.fp-unlink:before { content: "\ea2c"; }
.fp-inbox:before { content: "\ea1e"; }
.fp-layout-icon:before { content: "\ea1f"; }
.fp-map:before { content: "\ea20"; }
.fp-mobile:before { content: "\ea21"; }
.fp-pdf:before { content: "\ea22"; }
.fp-play-outline:before { content: "\ea23"; }
.fp-plus:before { content: "\ea24"; }
.fp-screen-outline:before { content: "\ea25"; }
.fp-script-outline:before { content: "\ea26"; }
.fp-slack-notification:before { content: "\ea27"; }
.fp-slack:before { content: "\ea28"; }
.fp-slideshow:before { content: "\ea29"; }
.fp-table:before { content: "\ea2a"; }
.fp-tachometer-alt-average:before { content: "\ea2b"; }
.fp-trash:before { content: "\ea2c"; }
.fp-unlink:before { content: "\ea2d"; }
43 changes: 22 additions & 21 deletions resources/fonts/pm-font/processmaker-font.module.less
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1738008776900'); /* IE9*/
src: url('processmaker-font.eot?t=1738008776900#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1738008776900") format("woff2"),
url("processmaker-font.woff?t=1738008776900") format("woff"),
url('processmaker-font.ttf?t=1738008776900') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1738008776900#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1738184445914'); /* IE9*/
src: url('processmaker-font.eot?t=1738184445914#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1738184445914") format("woff2"),
url("processmaker-font.woff?t=1738184445914") format("woff"),
url('processmaker-font.ttf?t=1738184445914') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1738184445914#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand Down Expand Up @@ -44,20 +44,21 @@
.fp-folder-outline:before { content: "\ea1b"; }
.fp-fullscreen:before { content: "\ea1c"; }
.fp-github:before { content: "\ea1d"; }
.fp-layout-icon:before { content: "\ea1e"; }
.fp-map:before { content: "\ea1f"; }
.fp-mobile:before { content: "\ea20"; }
.fp-pdf:before { content: "\ea21"; }
.fp-play-outline:before { content: "\ea22"; }
.fp-plus:before { content: "\ea23"; }
.fp-screen-outline:before { content: "\ea24"; }
.fp-script-outline:before { content: "\ea25"; }
.fp-slack-notification:before { content: "\ea26"; }
.fp-slack:before { content: "\ea27"; }
.fp-slideshow:before { content: "\ea28"; }
.fp-table:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea2a"; }
.fp-trash:before { content: "\ea2b"; }
.fp-unlink:before { content: "\ea2c"; }
.fp-inbox:before { content: "\ea1e"; }
.fp-layout-icon:before { content: "\ea1f"; }
.fp-map:before { content: "\ea20"; }
.fp-mobile:before { content: "\ea21"; }
.fp-pdf:before { content: "\ea22"; }
.fp-play-outline:before { content: "\ea23"; }
.fp-plus:before { content: "\ea24"; }
.fp-screen-outline:before { content: "\ea25"; }
.fp-script-outline:before { content: "\ea26"; }
.fp-slack-notification:before { content: "\ea27"; }
.fp-slack:before { content: "\ea28"; }
.fp-slideshow:before { content: "\ea29"; }
.fp-table:before { content: "\ea2a"; }
.fp-tachometer-alt-average:before { content: "\ea2b"; }
.fp-trash:before { content: "\ea2c"; }
.fp-unlink:before { content: "\ea2d"; }

}
Loading