Skip to content

Observation/FOUR-13977: All options are shown in Custom select in the process column in task #6155

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

Closed
wants to merge 2 commits into from
Closed

Observation/FOUR-13977: All options are shown in Custom select in the process column in task #6155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0426142
Search by process anme instead using a selectList in tasks
agustinbusso Feb 5, 2024
eecc36f
FOUR-13977 Formatting of operators for columns that work with strings.
gproly Feb 6, 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
10 changes: 5 additions & 5 deletions resources/js/common/PMColumnFilterPopoverCommonMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ const PMColumnFilterCommonMixin = {
if (column.format) {
format = column.format;
}
if (column.field === "status" || column.field === "assignee" || column.field === "participants" || column.field === 'process') {
if (column.field === "status" || column.field === "assignee" || column.field === "participants") {
format = "stringSelect";
}
return format;
Expand All @@ -139,14 +139,14 @@ const PMColumnFilterCommonMixin = {
if (column.field === "participants") {
formatRange = this.viewParticipants;
}
if (column.field === "process") {
formatRange = this.viewProcesses;
}
return formatRange;
},
getOperators(column) {
let operators = [];
if (column.field === "status" || column.field === "assignee" || column.field === "participants" || column.field === 'process') {
if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name") {
operators = ["=", "in", "contains", "regex"];
}
if (column.field === "status" || column.field === "assignee" || column.field === "participants") {
operators = ["=", "in"];
}
return operators;
Expand Down
16 changes: 9 additions & 7 deletions resources/js/tasks/components/TasksList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,15 +535,14 @@ export default {
let type = "Field";
//The inclusion of the alias in the comparison is necessary to ensure the correct
//type is obtained when the column has been modified by the method getAliasColumnForFilter().
if (value === "case_number" ||
value === "case_title" ||
value === "processRequest.case_number" ||
value === "processRequest.case_title") {
if (value === "case_number" ||
value === "case_title" ||
value === "process" ||
value === "processRequest.case_number" ||
value === "processRequest.case_title" ||
value === "processRequest.name") {
type = "Relationship";
}
if (value === "process") {
type = "Process";
}
if (value === "status") {
type = "Status";
}
Expand All @@ -556,6 +555,9 @@ export default {
if (value === "case_title") {
value = "processRequest.case_title";
}
if (value === "process") {
value = "processRequest.name";
}
if (value === "task_name") {
value = "element_name";
}
Expand Down