diff --git a/frontend/src/pages/Tasks.vue b/frontend/src/pages/Tasks.vue index 3a17614f..93775863 100644 --- a/frontend/src/pages/Tasks.vue +++ b/frontend/src/pages/Tasks.vue @@ -262,17 +262,11 @@ function parseRows(rows, columns = []) { tasks.value?.data.rows.forEach((row) => { _rows[row] = task[row] - let fieldType; - if (tasks.value.data.view_type === 'kanban') { - fieldType = columns?.find( - (col) => (col.fieldname || col.value) == row, - )?.fieldtype - } - else { - fieldType = columns?.find( - (col) => (col.key || col.value) == row, - )?.type - } + let fieldname = deals.value.data.view_type === 'kanban' ? 'fieldname' : 'key' + let fieldtype = deals.value.data.view_type === 'kanban' ? 'fieldtype' : 'type' + let fieldType = columns?.find( + (col) => (col[fieldname] || col.value) == row, + )?.[fieldtype] if ( fieldType &&