Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problem with numeric attributes and multi edit

Browse Source 
SVN revision: 2155
This commit is contained in:
Stefan Ritt 2008-12-12 06:43:46 +00:00
parent fbc419c45b
commit ba2c76af62
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/elogd.c
View File

@ -9584,6 +9584,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
strcpy(ua, attr_list[i]); strcpy(ua, attr_list[i]);
stou(ua); stou(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(" for (var i=0 ; i<document.form1.%s.value.length ; i++)\n", ua);
rsprintf(" if (document.form1.%s.value.charAt(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);
@ -9596,6 +9597,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf(" document.form1.%s.focus();\n", ua); rsprintf(" document.form1.%s.focus();\n", ua);
rsprintf(" return false;\n"); rsprintf(" return false;\n");
rsprintf(" }\n"); rsprintf(" }\n");
rsprintf(" }\n");
} }
if (attr_flags[i] & (AF_DATE | AF_DATETIME)) { if (attr_flags[i] & (AF_DATE | AF_DATETIME)) {
@ -21664,7 +21666,8 @@ void submit_elog(LOGBOOK * lbs)
if (!isdigit(str[i])) if (!isdigit(str[i]))
break; 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]); sprintf(error, loc("Error: Attribute <b>%s</b> must be numeric"), attr_list[index]);
show_error(error); show_error(error);
return; return;