Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-10 18:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Applied patch from Heiko Scheit fixing problem with 'Show attributes' causing the 'Format ...' options to be ignored

Browse Source 
SVN revision: 1217
This commit is contained in:
Stefan Ritt 2005-02-20 14:30:07 +00:00
parent 0b4423f3da
commit dcabc8c346
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.565 2005/02/20 14:30:07 ritt
Applied patch from Heiko Scheit fixing problem with 'Show attributes' causing the 'Format ...' options to be ignored
Revision 1.564 2005/02/16 14:50:40 ritt Revision 1.564 2005/02/16 14:50:40 ritt
Implemented $attachements subsitution in 'execute' command Implemented $attachements subsitution in 'execute' command
@ -8188,7 +8191,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
if (format_flags[index] & AFF_SAME_LINE) if (format_flags[index] & AFF_SAME_LINE)
/* if attribute on same line, do nothing */ /* if attribute on same line, do nothing */
rsprintf(""); rsprintf("");
else if (index < n_attr - 1 && (format_flags[index + 1] & AFF_SAME_LINE)) { else if (aindex < n_disp_attr - 1 && (format_flags[attr_index[aindex + 1]] & AFF_SAME_LINE)) {
/* if next attribute on same line, start a new subtable */ /* if next attribute on same line, start a new subtable */
rsprintf("<tr><td colspan=2><table width=\"100%%\" cellpadding=0 cellspacing=0><tr>"); rsprintf("<tr><td colspan=2><table width=\"100%%\" cellpadding=0 cellspacing=0><tr>");
subtable = 1; subtable = 1;
@ -8488,7 +8491,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
} }
} }
if (index < n_attr - 1 && (format_flags[index + 1] & AFF_SAME_LINE) == 0) { if (aindex < n_disp_attr - 1 && (format_flags[attr_index[aindex + 1]] & AFF_SAME_LINE) == 0) {
/* if next attribute not on same line, close row or subtable */ /* if next attribute not on same line, close row or subtable */
if (subtable) { if (subtable) {
rsprintf("</table></td></tr>\n"); rsprintf("</table></td></tr>\n");
@ -8498,7 +8501,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
} }
/* if last attribute, close row or subtable */ /* if last attribute, close row or subtable */
if (index == n_attr - 1) { if (aindex == n_disp_attr - 1) {
if (subtable) { if (subtable) {
rsprintf("</table></td></tr>\n"); rsprintf("</table></td></tr>\n");
subtable = 0; subtable = 0;