Skip to content

FOUR-13922 Configurable Requests and Tasks columns #6197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryancooley merged 3 commits into from
Feb 9, 2024
Merged

FOUR-13922 Configurable Requests and Tasks columns #6197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab77081
Control access to configure the Request and Task columns
caleeli Feb 8, 2024
9bf3e3a
Check if SavedSearch is installed
caleeli Feb 8, 2024
d2dd597
Fix condition
caleeli Feb 9, 2024
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
16 changes: 10 additions & 6 deletions ProcessMaker/Http/Controllers/RequestController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,16 @@ public function index($type = null)
$userFilter = SaveSession::getConfigFilter('requestFilter', Auth::user());

// Get default Saved search config
$defaultSavedSearch = SavedSearch::firstSystemSearchFor(
Auth::user(),
SavedSearch::KEY_REQUESTS,
);
if ($defaultSavedSearch) {
$defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns);
if (class_exists(SavedSearch::class)) {
$defaultSavedSearch = SavedSearch::firstSystemSearchFor(
Copy link
Copy Markdown
Contributor

@agustinbusso agustinbusso Feb 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When package is not installed is calling to SavedSearch::firstSystemSearchFor method, that method is in the package

Auth::user(),
SavedSearch::KEY_REQUESTS,
);
if ($defaultSavedSearch) {
$defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns);
} else {
$defaultColumns = null;
}
} else {
$defaultColumns = null;
}
Expand Down
16 changes: 10 additions & 6 deletions ProcessMaker/Http/Controllers/TaskController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,16 @@ public function index()
$userFilter = SaveSession::getConfigFilter('taskFilter', Auth::user());

// Get default Saved search config
$defaultSavedSearch = SavedSearch::firstSystemSearchFor(
Auth::user(),
SavedSearch::KEY_TASKS,
);
if ($defaultSavedSearch) {
$defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns);
if (class_exists(SavedSearch::class)) {
$defaultSavedSearch = SavedSearch::firstSystemSearchFor(
Auth::user(),
SavedSearch::KEY_TASKS,
);
if ($defaultSavedSearch) {
$defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns);
} else {
$defaultColumns = null;
}
} else {
$defaultColumns = null;
}
Expand Down
5 changes: 4 additions & 1 deletion resources/views/requests/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ function() use ($title) { return [__($title), null]; }
</template>

<template v-slot:right-buttons>
@if(Route::has('package.savedsearch.defaults.edit'))
@if((
Auth::user()->is_administrator ||
Auth::user()->hasPermission('edit-screens')
) && Route::has('package.savedsearch.defaults.edit'))
<b-button
class="ml-md-2"
href="{{route(
Expand Down
5 changes: 4 additions & 1 deletion resources/views/tasks/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@
</template>

<template v-slot:right-buttons>
@if(Route::has('package.savedsearch.defaults.edit'))
@if((
Auth::user()->is_administrator ||
Auth::user()->hasPermission('edit-screens')
) && Route::has('package.savedsearch.defaults.edit'))
<b-button
class="ml-md-2"
href="{{route(
Expand Down