Fossil SCM
Fix the new wiki-comments-on-ticket fieature so that it is controllable via TH1.
Commit
a884fbbd58ec9d626204d953700ca8bb0c991d4af7eae7517577952b6350fcee
Parent
0f36c889abd3644…
2 files changed
-4
+3
-4
| --- src/tkt.c | ||
| +++ src/tkt.c | ||
| @@ -776,14 +776,10 @@ | ||
| 776 | 776 | style_submenu_element("Timeline", "%R/info/%T", zUuid); |
| 777 | 777 | } |
| 778 | 778 | zFullName = db_text(0, |
| 779 | 779 | "SELECT tkt_uuid FROM ticket" |
| 780 | 780 | " WHERE tkt_uuid GLOB '%q*'", zUuid); |
| 781 | - if( g.perm.WrWiki && g.perm.WrTkt ){ | |
| 782 | - style_submenu_element("Edit Description", | |
| 783 | - "%R/wikiedit?name=ticket/%T", zFullName); | |
| 784 | - } | |
| 785 | 781 | if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br>\n", -1); |
| 786 | 782 | ticket_init(); |
| 787 | 783 | initializeVariablesFromCGI(); |
| 788 | 784 | getAllTicketFields(); |
| 789 | 785 | initializeVariablesFromDb(); |
| 790 | 786 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -776,14 +776,10 @@ | |
| 776 | style_submenu_element("Timeline", "%R/info/%T", zUuid); |
| 777 | } |
| 778 | zFullName = db_text(0, |
| 779 | "SELECT tkt_uuid FROM ticket" |
| 780 | " WHERE tkt_uuid GLOB '%q*'", zUuid); |
| 781 | if( g.perm.WrWiki && g.perm.WrTkt ){ |
| 782 | style_submenu_element("Edit Description", |
| 783 | "%R/wikiedit?name=ticket/%T", zFullName); |
| 784 | } |
| 785 | if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br>\n", -1); |
| 786 | ticket_init(); |
| 787 | initializeVariablesFromCGI(); |
| 788 | getAllTicketFields(); |
| 789 | initializeVariablesFromDb(); |
| 790 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -776,14 +776,10 @@ | |
| 776 | style_submenu_element("Timeline", "%R/info/%T", zUuid); |
| 777 | } |
| 778 | zFullName = db_text(0, |
| 779 | "SELECT tkt_uuid FROM ticket" |
| 780 | " WHERE tkt_uuid GLOB '%q*'", zUuid); |
| 781 | if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br>\n", -1); |
| 782 | ticket_init(); |
| 783 | initializeVariablesFromCGI(); |
| 784 | getAllTicketFields(); |
| 785 | initializeVariablesFromDb(); |
| 786 |
+3
| --- src/tktsetup.c | ||
| +++ src/tktsetup.c | ||
| @@ -496,10 +496,13 @@ | ||
| 496 | 496 | @ } |
| 497 | 497 | @ |
| 498 | 498 | @ if {[capexpr {n}]} { |
| 499 | 499 | @ submenu link "Copy Ticket" /tktnew/$tkt_uuid |
| 500 | 500 | @ } |
| 501 | +@ if {[capexpr {nk}]} { | |
| 502 | +@ submenu link "Edit Wiki" /wikiedit?name=ticket/$tkt_uuid | |
| 503 | +@ } | |
| 501 | 504 | @ </th1> |
| 502 | 505 | @ <tr><td class="tktDspLabel">Title:</td> |
| 503 | 506 | @ <td class="tktDspValue" colspan="3"> |
| 504 | 507 | @ $<title> |
| 505 | 508 | @ </td></tr> |
| 506 | 509 |
| --- src/tktsetup.c | |
| +++ src/tktsetup.c | |
| @@ -496,10 +496,13 @@ | |
| 496 | @ } |
| 497 | @ |
| 498 | @ if {[capexpr {n}]} { |
| 499 | @ submenu link "Copy Ticket" /tktnew/$tkt_uuid |
| 500 | @ } |
| 501 | @ </th1> |
| 502 | @ <tr><td class="tktDspLabel">Title:</td> |
| 503 | @ <td class="tktDspValue" colspan="3"> |
| 504 | @ $<title> |
| 505 | @ </td></tr> |
| 506 |
| --- src/tktsetup.c | |
| +++ src/tktsetup.c | |
| @@ -496,10 +496,13 @@ | |
| 496 | @ } |
| 497 | @ |
| 498 | @ if {[capexpr {n}]} { |
| 499 | @ submenu link "Copy Ticket" /tktnew/$tkt_uuid |
| 500 | @ } |
| 501 | @ if {[capexpr {nk}]} { |
| 502 | @ submenu link "Edit Wiki" /wikiedit?name=ticket/$tkt_uuid |
| 503 | @ } |
| 504 | @ </th1> |
| 505 | @ <tr><td class="tktDspLabel">Title:</td> |
| 506 | @ <td class="tktDspValue" colspan="3"> |
| 507 | @ $<title> |
| 508 | @ </td></tr> |
| 509 |