Fossil SCM
Add the same handling for the '$tkt_datetime' variable. Also, TH1 does not short-circuit the '&&' operator.
Commit
b84b8865a02d6a4748ffebe63c80bfff8d195030
Parent
a21d475e014893c…
1 file changed
+17
-11
+17
-11
| --- src/tktsetup.c | ||
| +++ src/tktsetup.c | ||
| @@ -474,11 +474,15 @@ | ||
| 474 | 474 | @ </td> |
| 475 | 475 | @ <td class="tktDspLabel">Resolution:</td><td class="tktDspValue"> |
| 476 | 476 | @ $<resolution> |
| 477 | 477 | @ </td></tr> |
| 478 | 478 | @ <tr><td class="tktDspLabel">Last Modified:</td><td class="tktDspValue"> |
| 479 | -@ $<tkt_datetime> | |
| 479 | +@ <th1> | |
| 480 | +@ if {[info exists tkt_datetime]} { | |
| 481 | +@ html $tkt_datetime | |
| 482 | +@ } | |
| 483 | +@ </th1> | |
| 480 | 484 | @ </td> |
| 481 | 485 | @ <th1>enable_output [hascap e]</th1> |
| 482 | 486 | @ <td class="tktDspLabel">Contact:</td><td class="tktDspValue"> |
| 483 | 487 | @ $<private_contact> |
| 484 | 488 | @ </td> |
| @@ -488,20 +492,22 @@ | ||
| 488 | 492 | @ <td colspan="3" valign="top" class="tktDspValue"> |
| 489 | 493 | @ $<foundin> |
| 490 | 494 | @ </td></tr> |
| 491 | 495 | @ |
| 492 | 496 | @ <th1> |
| 493 | -@ if {[info exists comment] && [string length $comment]>10} { | |
| 494 | -@ html { | |
| 495 | -@ <tr><td class="tktDspLabel">Description:</td></tr> | |
| 496 | -@ <tr><td colspan="5" class="tktDspValue"> | |
| 497 | -@ } | |
| 498 | -@ if {[info exists plaintext]} { | |
| 499 | -@ set r [randhex] | |
| 500 | -@ wiki "<verbatim-$r links>\n$comment\n</verbatim-$r>" | |
| 501 | -@ } else { | |
| 502 | -@ wiki $comment | |
| 497 | +@ if {[info exists comment]} { | |
| 498 | +@ if {[string length $comment]>10} { | |
| 499 | +@ html { | |
| 500 | +@ <tr><td class="tktDspLabel">Description:</td></tr> | |
| 501 | +@ <tr><td colspan="5" class="tktDspValue"> | |
| 502 | +@ } | |
| 503 | +@ if {[info exists plaintext]} { | |
| 504 | +@ set r [randhex] | |
| 505 | +@ wiki "<verbatim-$r links>\n$comment\n</verbatim-$r>" | |
| 506 | +@ } else { | |
| 507 | +@ wiki $comment | |
| 508 | +@ } | |
| 503 | 509 | @ } |
| 504 | 510 | @ } |
| 505 | 511 | @ set seenRow 0 |
| 506 | 512 | @ set alwaysPlaintext [info exists plaintext] |
| 507 | 513 | @ query {SELECT datetime(tkt_mtime) AS xdate, login AS xlogin, |
| 508 | 514 |
| --- src/tktsetup.c | |
| +++ src/tktsetup.c | |
| @@ -474,11 +474,15 @@ | |
| 474 | @ </td> |
| 475 | @ <td class="tktDspLabel">Resolution:</td><td class="tktDspValue"> |
| 476 | @ $<resolution> |
| 477 | @ </td></tr> |
| 478 | @ <tr><td class="tktDspLabel">Last Modified:</td><td class="tktDspValue"> |
| 479 | @ $<tkt_datetime> |
| 480 | @ </td> |
| 481 | @ <th1>enable_output [hascap e]</th1> |
| 482 | @ <td class="tktDspLabel">Contact:</td><td class="tktDspValue"> |
| 483 | @ $<private_contact> |
| 484 | @ </td> |
| @@ -488,20 +492,22 @@ | |
| 488 | @ <td colspan="3" valign="top" class="tktDspValue"> |
| 489 | @ $<foundin> |
| 490 | @ </td></tr> |
| 491 | @ |
| 492 | @ <th1> |
| 493 | @ if {[info exists comment] && [string length $comment]>10} { |
| 494 | @ html { |
| 495 | @ <tr><td class="tktDspLabel">Description:</td></tr> |
| 496 | @ <tr><td colspan="5" class="tktDspValue"> |
| 497 | @ } |
| 498 | @ if {[info exists plaintext]} { |
| 499 | @ set r [randhex] |
| 500 | @ wiki "<verbatim-$r links>\n$comment\n</verbatim-$r>" |
| 501 | @ } else { |
| 502 | @ wiki $comment |
| 503 | @ } |
| 504 | @ } |
| 505 | @ set seenRow 0 |
| 506 | @ set alwaysPlaintext [info exists plaintext] |
| 507 | @ query {SELECT datetime(tkt_mtime) AS xdate, login AS xlogin, |
| 508 |
| --- src/tktsetup.c | |
| +++ src/tktsetup.c | |
| @@ -474,11 +474,15 @@ | |
| 474 | @ </td> |
| 475 | @ <td class="tktDspLabel">Resolution:</td><td class="tktDspValue"> |
| 476 | @ $<resolution> |
| 477 | @ </td></tr> |
| 478 | @ <tr><td class="tktDspLabel">Last Modified:</td><td class="tktDspValue"> |
| 479 | @ <th1> |
| 480 | @ if {[info exists tkt_datetime]} { |
| 481 | @ html $tkt_datetime |
| 482 | @ } |
| 483 | @ </th1> |
| 484 | @ </td> |
| 485 | @ <th1>enable_output [hascap e]</th1> |
| 486 | @ <td class="tktDspLabel">Contact:</td><td class="tktDspValue"> |
| 487 | @ $<private_contact> |
| 488 | @ </td> |
| @@ -488,20 +492,22 @@ | |
| 492 | @ <td colspan="3" valign="top" class="tktDspValue"> |
| 493 | @ $<foundin> |
| 494 | @ </td></tr> |
| 495 | @ |
| 496 | @ <th1> |
| 497 | @ if {[info exists comment]} { |
| 498 | @ if {[string length $comment]>10} { |
| 499 | @ html { |
| 500 | @ <tr><td class="tktDspLabel">Description:</td></tr> |
| 501 | @ <tr><td colspan="5" class="tktDspValue"> |
| 502 | @ } |
| 503 | @ if {[info exists plaintext]} { |
| 504 | @ set r [randhex] |
| 505 | @ wiki "<verbatim-$r links>\n$comment\n</verbatim-$r>" |
| 506 | @ } else { |
| 507 | @ wiki $comment |
| 508 | @ } |
| 509 | @ } |
| 510 | @ } |
| 511 | @ set seenRow 0 |
| 512 | @ set alwaysPlaintext [info exists plaintext] |
| 513 | @ query {SELECT datetime(tkt_mtime) AS xdate, login AS xlogin, |
| 514 |