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 vanishing text on preview with preset under condition

Browse Source 
SVN revision: 1534
This commit is contained in:
Stefan Ritt 2005-10-26 14:15:31 +00:00
parent 35fa74338c
commit 264942e483
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/elogd.c
View File

@ -7808,7 +7808,7 @@ void rsicon(char *name, char *comment, char *elcode)
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL bupload, BOOL breedit, void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL bupload, BOOL breedit,
BOOL bduplicate, BOOL preview) BOOL bduplicate, BOOL bpreview)
{ {
int i, j, n, index, aindex, size, width, height, fh, length, input_size, input_maxlen, int i, j, n, index, aindex, size, width, height, fh, length, input_size, input_maxlen,
format_flags[MAX_N_ATTR], year, month, day, hour, min, sec, n_attr, n_disp_attr, format_flags[MAX_N_ATTR], year, month, day, hour, min, sec, n_attr, n_disp_attr,
@ -8883,7 +8883,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
} }
} }
if (preview) { if (bpreview) {
_current_message_id = message_id; _current_message_id = message_id;
rsprintf("<tr><td colspan=2 class=\"messageframe\">\n"); rsprintf("<tr><td colspan=2 class=\"messageframe\">\n");
@ -9086,7 +9086,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
preset_text = FALSE; preset_text = FALSE;
/* user preset on reedit only if preset is under condition */ /* user preset on reedit only if preset is under condition */
if (breedit && getcfg(lbs->name, "Preset text", str, sizeof(str)) == 2) if (breedit && !bpreview && !bupload && getcfg(lbs->name, "Preset text", str, sizeof(str)) == 2)
preset_text = TRUE; preset_text = TRUE;
} }