Merge remote-tracking branch 'origin/master' into Merge184

module/task/ui/activate.html.php

@@ -330,7 +330,7 @@ formPanel
         (
             set::width('1/2'),
             set::label($lang->task->assignedTo),
-            set::required($isMultiple),
+            set::required($isMultiple || strpos(",{$this->config->task->activate->requiredFields},", ',assignedTo,')),
             inputGroup
             (
                 picker
@@ -339,6 +339,7 @@ formPanel
                     set::name('assignedTo'),
                     set::items($isMultiple ? $teamMembers : $members),
                     set::value($isMultiple ? '' : $task->finishedBy),
+                    set::required(strpos(",{$this->config->task->activate->requiredFields},", ',assignedTo,') !== false),
                     on::change('setTeamUser')
                 ),
                 $modalTeamBtn
@@ -350,11 +351,9 @@ formPanel
     formGroup
     (
         set::label($lang->comment),
-        editor
-        (
-            set::name('comment'),
-            set::rows('5')
-        )
+        set::control('editor'),
+        set::name('comment'),
+        set::rows('5')
     ),
     modalTrigger
     (

module/task/ui/edit.html.php

@@ -412,16 +412,19 @@ detailBody
             (
                 set::name($lang->task->estimate),
                 set::required(strpos(",{$this->config->task->edit->requiredFields},", ",estimate,") !== false),
-                inputControl
+                formGroup
                 (
-                    input
+                    inputControl
                     (
-                        set::name('estimate'),
-                        set::value($task->estimate),
-                        !empty($task->team) ? set::readonly(true) : null
-                    ),
-                    to::suffix($lang->task->suffixHour),
-                    set::suffixWidth(20)
+                        input
+                        (
+                            set::name('estimate'),
+                            set::value($task->estimate),
+                            !empty($task->team) ? set::readonly(true) : null
+                        ),
+                        to::suffix($lang->task->suffixHour),
+                        set::suffixWidth(20)
+                    )
                 )
             ),
             item
@@ -449,16 +452,19 @@ detailBody
             item
             (
                 set::name($lang->task->left),
-                inputControl
+                formGroup
                 (
-                    input
+                    inputControl
                     (
-                        set::name('left'),
-                        set::value($task->left),
-                        !empty($task->team) ? set::readonly(true) : null
-                    ),
-                    to::suffix($lang->task->suffixHour),
-                    set::suffixWidth(20)
+                        input
+                        (
+                            set::name('left'),
+                            set::value($task->left),
+                            !empty($task->team) ? set::readonly(true) : null
+                        ),
+                        to::suffix($lang->task->suffixHour),
+                        set::suffixWidth(20)
+                    )
                 )
             )
         ),