diff --git a/module/task/js/batchedit.ui.js b/module/task/js/batchedit.ui.js
index 49f7cbaf1b..38e056e2e4 100644
--- a/module/task/js/batchedit.ui.js
+++ b/module/task/js/batchedit.ui.js
@@ -23,18 +23,22 @@ window.renderRowData = function($row, index, row)
taskMembers = members;
}
+ const taskUsers = [];
+ let disabled = false;
let $assignedTo = $row.find('.form-batch-input[data-name="assignedTo"]').empty();
if(teams[row.id] != undefined && ((row.assignedTo != currentUser && row.mode == 'linear') || taskMembers[currentUser] == undefined))
{
- $assignedTo.attr('disabled', 'disabled');
+ disabled = true;
}
if(row.assignedTo && taskMembers[row.assignedTo] == undefined) taskMembers[row.assignedTo] = users[row.assignedTo];
- $assignedTo.append('');
- for(let account in taskMembers)
- {
- $assignedTo.append('');
- }
+ for(let account in taskMembers) taskUsers.push({value: account, text: taskMembers[account]});
+
+ $(`#assignedTo_${index}`).picker({
+ items: taskUsers,
+ defaultValue: row.assignedTo,
+ disabled: disabled,
+ });
if(teams[row.id] != undefined || row.parent < 0)
{
diff --git a/module/task/ui/batchcreate.html.php b/module/task/ui/batchcreate.html.php
index 7db8a827c1..a05ce1e80c 100644
--- a/module/task/ui/batchcreate.html.php
+++ b/module/task/ui/batchcreate.html.php
@@ -173,8 +173,9 @@ formBatchPanel
(
set::name('pri'),
set::label($lang->task->pri),
- set::control('select'),
+ set::control('priPicker'),
set::value(3),
+ set::required(true),
set::items($lang->task->priList),
set::width('80px'),
),
diff --git a/module/task/ui/batchedit.html.php b/module/task/ui/batchedit.html.php
index 8942b6cc77..cad84afb0b 100644
--- a/module/task/ui/batchedit.html.php
+++ b/module/task/ui/batchedit.html.php
@@ -47,7 +47,7 @@ formBatchPanel
(
set::name('module'),
set::label($lang->task->module),
- set::control('select'),
+ set::control('picker'),
set::items($modules),
set::width('200px'),
set::ditto(true),
@@ -57,7 +57,7 @@ formBatchPanel
(
set::name('assignedTo'),
set::label($lang->task->assignedTo),
- set::control('select'),
+ set::control('picker'),
set::items(array()),
set::width('128px'),
set::ditto(true),
@@ -67,7 +67,7 @@ formBatchPanel
(
set::name('type'),
set::label($lang->task->type),
- set::control('select'),
+ set::control('picker'),
set::items($lang->task->typeList),
set::width('128px'),
set::ditto(true),
@@ -77,7 +77,7 @@ formBatchPanel
(
set::name('status'),
set::label($lang->task->status),
- set::control('select'),
+ set::control('picker'),
set::items($lang->task->statusList),
set::width('128px'),
set::ditto(true),
@@ -101,7 +101,7 @@ formBatchPanel
(
set::name('pri'),
set::label($lang->task->pri),
- set::control('select'),
+ set::control('priPicker'),
set::items($lang->task->priList),
set::width('80px'),
),