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

2023-11-21 19:43:29 -05:00
parent 03bb2496a2 55b76ba55a
commit d20ef33df8
149 changed files with 1597 additions and 1842 deletions
@@ -167,11 +167,9 @@ formPanel
    formGroup
    (
        set::label($lang->testtask->desc),
-        editor
-        (
-            set::name('desc'),
-            set::rows(10)
-        )
+        set::control('editor'),
+        set::name('desc'),
+        set::rows(10)
    ),
    formGroup
    (
@@ -128,6 +128,7 @@ formPanel
    formGroup
    (
        set::label($lang->testtask->desc),
+        set::required(strpos(",{$this->config->testtask->edit->requiredFields},", ",desc,") !== false),
        editor
        (
            set::name('desc'),