- members) and (!isset($task->members[$app->user->account]) or ($task->assignedTo != $app->user->account and $task->mode == 'linear'))):?>
+ members) and (!isset($task->members[$app->user->account]) or $task->mode == 'linear')):?>
task->left;?>
@@ -77,7 +86,7 @@
task->status;?>
- printExtendFields($task, 'table', 'columns=2');?>
+ printExtendFields($task, 'table', 'columns=2');?>
comment;?>
- assignedTo != $app->user->account and $task->mode == 'linear'):?>
-
team) ? $lang->task->assign : $lang->task->transferTo;?>
team) ? $task->assignedTo : $task->nextUser, "class='form-control chosen'");?>
-
+
status != 'done' and $task->status != 'closed' and $task->parent >= 0):?>
task->left;?>
-
+
task->status;?>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 39d546547e..b08085db62 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -290,7 +290,7 @@ foreach(explode(',', $config->task->edit->requiredFields) as $field)
$memberDisabled = false;
$linearDisabled = false;
if($memberStatus == 'done') $memberDisabled = true;
- if($memberDisabled and $task->mode == 'linear') $linearDisabled = true;
+ if($memberStatus != 'wait' and $task->mode == 'linear') $linearDisabled = true;
?>
@@ -347,5 +347,5 @@ foreach(explode(',', $config->task->edit->requiredFields) as $field)
id);?>
-
+mode == 'linear') js::set('sortSelector', 'tr.member-wait');?>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index 27f302d708..10b171c3ad 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -69,7 +69,18 @@
team) and $task->mode == 'linear') ? $lang->task->transferTo : $lang->task->assign;?>
- nextBy, "class='form-control chosen'");?>
+
+ team) and $task->mode == 'linear')
+ {
+ echo zget($members, $task->nextBy) . html::hidden('assignedTo', $task->nextBy);
+ }
+ else
+ {
+ echo html::select('assignedTo', $members, $task->nextBy, "class='form-control chosen'");
+ }
+ ?>
+
task->realStarted;?>
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index c474b6e698..8c7edc744f 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -46,7 +46,16 @@
task->assignedTo;?>
-
+ mode == 'linear')
+ {
+ echo zget($members, $assignedTo) . html::hidden('assignedTo', $assignedTo);
+ }
+ else
+ {
+ echo html::select('assignedTo', $members, $assignedTo, "class='form-control chosen'");
+ }
+ ?>
@@ -63,7 +72,7 @@
task->hour;?>
-
+
task->deniedNotice, '' . $task->assignedToRealName . '', $lang->task->transfer);?>
+ mode == 'linear'):?> +task->transferNotice;?>
task->deniedNotice, '' . $lang->task->teamMember . '', $lang->task->transfer);?>
@@ -40,12 +40,12 @@left, "class='form-control'");?> task->hour;?>