mirror of
https://gitea.psi.ch/ELOG/elog.git
synced 2026-09-08 17:13:56 +00:00
Don't evaluate preset attributes on "duplicate"
SVN revision: 1583
This commit is contained in:
parent
1a18123ff1
commit
a6e106fea0
@ -8098,7 +8098,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
|
|||||||
sprintf(str, "Preset %s", attr_list[index]);
|
sprintf(str, "Preset %s", attr_list[index]);
|
||||||
if ((i = getcfg(lbs->name, str, preset, sizeof(preset))) > 0) {
|
if ((i = getcfg(lbs->name, str, preset, sizeof(preset))) > 0) {
|
||||||
|
|
||||||
if ((!bedit && !breply) || /* don't subst on edit or reply */
|
if ((!bedit && !breply && !bduplicate) || /* don't subst on edit or reply */
|
||||||
(breedit && i == 2)) { /* subst on reedit only if preset is under condition */
|
(breedit && i == 2)) { /* subst on reedit only if preset is under condition */
|
||||||
|
|
||||||
/* do not format date for date attributes */
|
/* do not format date for date attributes */
|
||||||
@ -8164,7 +8164,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
|
|||||||
sprintf(str, "Preset %s", attr_list[index]);
|
sprintf(str, "Preset %s", attr_list[index]);
|
||||||
if ((i = getcfg(lbs->name, str, preset, sizeof(preset))) > 0) {
|
if ((i = getcfg(lbs->name, str, preset, sizeof(preset))) > 0) {
|
||||||
|
|
||||||
if ((!bedit && !breply) || /* don't subst on edit or reply */
|
if ((!bedit && !breply && !bduplicate) || /* don't subst on edit or reply */
|
||||||
(breedit && i == 2)) { /* subst on reedit only if preset is under condition */
|
(breedit && i == 2)) { /* subst on reedit only if preset is under condition */
|
||||||
|
|
||||||
/* do not format date for date attributes */
|
/* do not format date for date attributes */
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user