From ba2c76af62876888b194c5eec9c8ea92bf65f2da Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Fri, 12 Dec 2008 06:43:46 +0000
Subject: [PATCH] Fixed problem with numeric attributes and multi edit

SVN revision: 2155
---
 src/elogd.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/elogd.c b/src/elogd.c
index 3ecc2e20..f03c6d93 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -9584,17 +9584,19 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
          strcpy(ua, attr_list[i]);
          stou(ua);
 
-         rsprintf("  for (var i=0 ; i<document.form1.%s.value.length ; i++)\n", ua);
-         rsprintf("    if (document.form1.%s.value.charAt(i) != \",\" &&\n", ua);
-         rsprintf("        document.form1.%s.value.charAt(i) != \".\" &&\n", ua);
-         rsprintf("        document.form1.%s.value.charAt(i) != \"-\" &&\n", ua);
-         rsprintf("        (document.form1.%s.value.charAt(i) < \"0\" ||\n", ua);
-         rsprintf("         document.form1.%s.value.charAt(i) > \"9\")) { break }\n", ua);
-         rsprintf("  if (i<document.form1.%s.value.length) {\n", ua);
+         rsprintf("  if (document.form1.%s.value != '- %s -') {\n", ua, loc("keep original values"));
+         rsprintf("    for (var i=0 ; i<document.form1.%s.value.length ; i++)\n", ua);
+         rsprintf("      if (document.form1.%s.value.charAt(i) != \",\" &&\n", ua);
+         rsprintf("          document.form1.%s.value.charAt(i) != \".\" &&\n", ua);
+         rsprintf("          document.form1.%s.value.charAt(i) != \"-\" &&\n", ua);
+         rsprintf("          (document.form1.%s.value.charAt(i) < \"0\" ||\n", ua);
+         rsprintf("           document.form1.%s.value.charAt(i) > \"9\")) { break }\n", ua);
+         rsprintf("    if (i<document.form1.%s.value.length) {\n", ua);
          sprintf(str, loc("Please enter numeric value for '%s'"), attr_list[i]);
-         rsprintf("    alert(\"%s\");\n", str);
-         rsprintf("    document.form1.%s.focus();\n", ua);
-         rsprintf("    return false;\n");
+         rsprintf("      alert(\"%s\");\n", str);
+         rsprintf("      document.form1.%s.focus();\n", ua);
+         rsprintf("      return false;\n");
+         rsprintf("    }\n");
          rsprintf("  }\n");
       }
 
@@ -21664,7 +21666,8 @@ void submit_elog(LOGBOOK * lbs)
             if (!isdigit(str[i]))
                break;
 
-         if (i < (int) strlen(str) && strcmp(str, "<keep>") != 0) {
+         sprintf(str2, "- %s -", loc("keep original values"));
+         if (i < (int) strlen(str) && strcmp(str, "<keep>") != 0 && strcmp(str, str2) != 0) {
             sprintf(error, loc("Error: Attribute <b>%s</b> must be numeric"), attr_list[index]);
             show_error(error);
             return;