Improve error messages on review form mistakes.

ubc · Oct 27, 2020 · fea0fd1 · fea0fd1
1 parent 7612e57
commit fea0fd1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/scripts/settings.js b/scripts/settings.js
@@ -471,7 +471,7 @@ function append_field(fid, pos) {
 }
 
 function rfs(data) {
-    var i, fid, $j;
+    var i, fid, $j, m;
     original = data.fields;
     samples = data.samples;
     stemplate = data.stemplate;
@@ -496,8 +496,10 @@ function rfs(data) {
 
     // highlight errors, apply request
     for (i in data.req || {}) {
-        if (!$("#" + i).length)
-            rfs.add(false, i.replace(/^.*_/, ""));
+        if (!$("#" + i).length
+            && (m = i.match(/^(?:rf_|)([st]\d+)(?:|_.*)$/))) {
+            add_field(m[1]);
+        }
         $j = $("#" + i);
         if (!text_eq($j.val(), data.req[i])) {
             $j.val(data.req[i]);

diff --git a/src/settings/s_reviewform.php b/src/settings/s_reviewform.php
@@ -67,6 +67,7 @@ private function populate_field($fj, ReviewField $f, SettingValues $sv, $fid) {
         } else {
             $fj->name = $sn;
         }
+        $error_sn = $sn ? : "<Unnamed field>";
 
         if ($sv->has_reqv("rf_{$fid}_position")) {
             $pos = cvtnum($sv->reqv("rf_{$fid}_position"));
@@ -109,7 +110,7 @@ private function populate_field($fj, ReviewField $f, SettingValues $sv, $fid) {
                 if ($fj->description === "")
                     unset($fj->description);
             } else if ($pos > 0) {
-                $sv->error_at("rf_{$fid}_description", htmlspecialchars($sn) . " description: " . $err);
+                $sv->error_at("rf_{$fid}_description", htmlspecialchars($error_sn) . " description: " . $err);
             }
         }
 
@@ -125,7 +126,7 @@ private function populate_field($fj, ReviewField $f, SettingValues $sv, $fid) {
                 $ok = $this->check_options($sv, $fid, $fj);
             }
             if ((!$ok || count($fj->options) < 2) && $pos > 0) {
-                $sv->error_at("rf_{$fid}_options", htmlspecialchars($sn) . ": Invalid choices.");
+                $sv->error_at("rf_{$fid}_options", htmlspecialchars($error_sn) . ": Invalid choices.");
                 if ($this->option_error) {
                     $sv->error_at(null, $this->option_error);
                 }