Patch level : 10.0 92

Files correlati     : ba7.exe
Ricompilazione Demo : [ ]
Commento           :

Aggiunto al postino l'opzione di cancellare le transazioni annullate


git-svn-id: svn://10.65.10.50/trunk@16902 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2008-07-21 11:23:24 +00:00
parent be9a863efa
commit 3ef370dbff
3 changed files with 15 additions and 3 deletions

View File

@ -959,8 +959,11 @@ bool TMailer_mask::exec_app(int& err, const TString& appname, TMail_message& msg
if (ini.get("Result").compare("OK", -1, true) == 0 ||
ini.get("Action").compare("RUN", -1, true) == 0)
err = 0;
else
err = ini.get_int("Error");
else
if (get_bool(F_DELCANCEL) && ini.get("Result").compare("Cancel", -1, true) == 0)
err = 0;
else
err = ini.get_int("Error");
TFilename backup = get(F_BACKUP);
expand_sys_vars(backup);
@ -1459,6 +1462,7 @@ void TMailer_mask::save() const
ini.set("Timer", get(F_TIMER));
ini.set("Log", get(F_TRACKING));
ini.set("Backup", get(F_BACKUP));
ini.set("DelCancel", get(F_DELCANCEL));
save_sheet(ini, F_ADDRESSES, "Recipient");
save_sheet(ini, F_PARAMS, "Filter");
}
@ -1472,6 +1476,7 @@ void TMailer_mask::load()
set(F_TIMER, ini.get_int("Timer"));
set(F_TRACKING, ini.get("Log"));
set(F_BACKUP, ini.get("Backup"));
set(F_DELCANCEL, ini.get("DelCancel"));
load_sheet(ini, F_ADDRESSES, "Recipient");
load_sheet(ini, F_PARAMS, "Filter");

View File

@ -21,10 +21,12 @@
#define F_BODY 106
#define F_MAILER 107
#define F_ID 108
#define F_DELCANCEL 109
#define F_DEST 101
#define F_GROUP 102
#define F_FILE 102
#define F_OPERATOR 103
#define F_EXPR 104

View File

@ -62,12 +62,17 @@ BEGIN
PROMPT 1 2 "Log transazioni (CSV) "
END
STRING F_BACKUP 80 55
STRING F_BACKUP 80 45
BEGIN
PROMPT 1 3 "Backup "
GROUP G_SUPERUSER
END
BOOLEAN F_DELCANCEL
BEGIN
PROMPT 55 3 "Elimina transazioni annullate"
END
SPREADSHEET F_MESSAGES 0 -3
BEGIN
PROMPT 0 4 ""