Revision 3c9a35dc
Von Tamino Steinert vor etwa 1 Jahr hinzugefügt
| SL/DB/MetaSetup/EmailJournal.pm | ||
|---|---|---|
| 22 | 22 |
recipients => { type => 'text', not_null => 1 },
|
| 23 | 23 |
sender_id => { type => 'integer' },
|
| 24 | 24 |
sent_on => { type => 'timestamp', default => 'now()', not_null => 1 },
|
| 25 |
status => { type => 'enum', check_in => [ 'sent', 'send_failed', 'imported' ], db_type => 'email_journal_status', not_null => 1 },
|
|
| 25 |
status => { type => 'enum', check_in => [ 'sent', 'send_failed', 'imported', 'record_imported' ], db_type => 'email_journal_status', not_null => 1 },
|
|
| 26 | 26 |
subject => { type => 'text', not_null => 1 },
|
| 27 | 27 |
uid => { type => 'integer' },
|
| 28 | 28 |
); |
| SL/Presenter/EmailJournal.pm | ||
|---|---|---|
| 33 | 33 |
my ($email_journal_entry, %params) = @_; |
| 34 | 34 |
|
| 35 | 35 |
my %status_to_text = ( |
| 36 |
sent => t8('sent'),
|
|
| 37 |
send_failed => t8('send failed'),
|
|
| 38 |
imported => t8('imported'),
|
|
| 36 |
sent => t8('sent'),
|
|
| 37 |
send_failed => t8('send failed'),
|
|
| 38 |
imported => t8('imported'),
|
|
| 39 |
record_imported => t8('record imported'),
|
|
| 39 | 40 |
); |
| 40 | 41 |
|
| 41 | 42 |
my $status = $email_journal_entry->status; |
| sql/Pg-upgrade2/email_journal_extend_status.sql | ||
|---|---|---|
| 1 |
-- @tag: email_journal_extend_status |
|
| 2 |
-- @description: Zusätzlicher Status für E-Mail-Journal |
|
| 3 |
-- @depends: release_3_8_0 email_import email_journal_add_uidvalidity |
|
| 4 |
|
|
| 5 |
ALTER TYPE email_journal_status ADD VALUE 'record_imported' AFTER 'imported'; |
|
| templates/design40_webpages/email_journal/_filter.html | ||
|---|---|---|
| 22 | 22 |
</tr> |
| 23 | 23 |
<tr> |
| 24 | 24 |
<th>[% LxERP.t8("Status") %]</th>
|
| 25 |
<td>[% L.select_tag("filter.status:eq_ignore_empty", [ [ "", "" ], [ "send_failed", LxERP.t8("send failed") ], [ "sent", LxERP.t8("sent") ], [ "imported", LxERP.t8("imported") ] ], default=filter.status_eq_ignore_empty) %]</td>
|
|
| 25 |
<td>[% L.select_tag("filter.status:eq_ignore_empty", [
|
|
| 26 |
[ "", "" ], |
|
| 27 |
[ "send_failed", LxERP.t8("send failed") ],
|
|
| 28 |
[ "sent", LxERP.t8("sent") ],
|
|
| 29 |
[ "imported", LxERP.t8("imported") ]
|
|
| 30 |
[ "record_imported", LxERP.t8("record imported") ]
|
|
| 31 |
], default=filter.status_eq_ignore_empty) %]</td> |
|
| 26 | 32 |
</td> |
| 27 | 33 |
</tr> |
| 28 | 34 |
</tbody> |
| templates/webpages/email_journal/_filter.html | ||
|---|---|---|
| 26 | 26 |
</tr> |
| 27 | 27 |
<tr> |
| 28 | 28 |
<th align="right">[% LxERP.t8("Status") %]</th>
|
| 29 |
<td>[% L.select_tag("filter.status:eq_ignore_empty", [ [ "", "" ], [ "send_failed", LxERP.t8("send failed") ], [ "sent", LxERP.t8("sent") ], [ "imported", LxERP.t8("imported") ] ], default=filter.status_eq_ignore_empty) %]</td>
|
|
| 29 |
<td>[% L.select_tag("filter.status:eq_ignore_empty", [
|
|
| 30 |
[ "", "" ], |
|
| 31 |
[ "send_failed", LxERP.t8("send failed") ],
|
|
| 32 |
[ "sent", LxERP.t8("sent") ],
|
|
| 33 |
[ "imported", LxERP.t8("imported") ]
|
|
| 34 |
[ "record_imported", LxERP.t8("record imported") ]
|
|
| 35 |
], default=filter.status_eq_ignore_empty) %]</td> |
|
| 30 | 36 |
</tr> |
| 31 | 37 |
</table> |
| 32 | 38 |
|
Auch abrufbar als: Unified diff
EmailJournal: Zusätzlicher Type für Beleg-Importe