Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision fff3f239

Von Tamino Steinert vor 8 Monaten hinzugefügt

  • ID fff3f2398b3c0bf0e8ed7bc5a8c855441829f269
  • Vorgänger 72be8f98
  • Nachfolger f3503af0

EmailJournal: FIX: Status im Bericht richtig anzeigen

Unterschiede anzeigen:

templates/design40_webpages/email_journal/list.html
1 1
[% USE HTML %]
2 2
[% USE L %]
3
[% USE P %]
3 4
[% USE LxERP %]
4 5

  
5 6
<h1>[% FORM.title %]</h1>
......
28 29
  </thead>
29 30
  <tbody>
30 31
    [% FOREACH entry = ENTRIES %]
31
    <tr id="email_journal_id_[% entry.id %]">
32
    <tr id="email_journal_id_[% entry.id %]" [% IF entry.status == 'send_failed' %] class="listrow_error" [% END %]>
32 33
      [% IF SELF.can_view_all %]
33 34
        <td>[% IF entry.sender %] [% HTML.escape(entry.sender.name) %] [% ELSE %] [% LxERP.t8("kivitendo") %] [% END %]</td>
34 35
      [% END %]
......
36 37
      <td>[% HTML.escape(entry.recipients) %]</td>
37 38
      <td><a href="[% SELF.url_for(action => 'show', id => entry.id, back_to => SELF.get_callback) %]"> [% HTML.escape(entry.subject) %] </a></td>
38 39
      <td>[% HTML.escape(entry.sent_on.to_lxoffice('precision' => 'second')) %]</td>
39
      <td>
40
        [% IF entry.status == 'sent' %]
41
          [% LxERP.t8('sent') %]
42
        [% ELSIF entry.status == 'send_failed' %]
43
          [% LxERP.t8('send failed') %]
44
        [% ELSIF entry.status == 'imported' %]
45
          [% LxERP.t8('imported') %]
46
        [% ELSE %]
47
          [% entry.status %]
48
        [% END %]
49
      </td>
40
      <td> [% P.email_journal.entry_status(entry) %] </td>
50 41
      <td>[% HTML.escape(entry.extended_status) %]</td>
51 42
    </tr>
52 43
    [% END %]
templates/webpages/email_journal/list.html
1
[% USE HTML %][% USE L %][% USE LxERP %]
1
[% USE HTML %][% USE L %][% USE P %][% USE LxERP %]
2 2

  
3 3
<h1>[% FORM.title %]</h1>
4 4

  
......
51 51
    </a>
52 52
   </td>
53 53
   <td>[%- HTML.escape(entry.sent_on.to_lxoffice('precision' => 'second')) %]</td>
54
   <td>
55
     [% IF entry.status == 'sent' %]
56
       [% LxERP.t8('sent') %]
57
     [% ELSIF entry.status == 'send_failed' %]
58
       [% LxERP.t8('send failed') %]
59
     [% ELSIF entry.status == 'imported' %]
60
       [% LxERP.t8('imported') %]
61
     [% ELSE %]
62
       [% entry.status %]
63
     [% END %]
64
   </td>
54
   <td> [% P.email_journal.entry_status(entry) %] </td>
65 55
   <td>[%- HTML.escape(entry.extended_status) %]</td>
66 56
  </tr>
67 57
  [%- END %]

Auch abrufbar als: Unified diff