From 85775acd760c668a73f9febf80009832ddf91af9 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 05 Mar 2014 11:42:34 -0500 Subject: [PATCH] Delegate closed ticket changes to the Edit Ticket page --- src/main/java/com/gitblit/wicket/pages/EditTicketPage.html | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.html b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.html index 5d8f682..b3c102d 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.html +++ b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.html @@ -39,8 +39,10 @@ </div> </td></tr> <tr><th><wicket:message key="gb.type"></wicket:message><span style="color:red;">*</span></th><td class="edit"><select class="input-large" wicket:id="type"></select></td></tr> + <tr><th><wicket:message key="gb.status"></wicket:message><span style="color:red;">*</span></th><td class="edit"><select class="input-large" wicket:id="status"></select></td></tr> <tr wicket:id="responsible"></tr> <tr wicket:id="milestone"></tr> + <tr wicket:id="mergeto"></tr> </table> </div> </div> @@ -62,5 +64,9 @@ <th><wicket:message key="gb.milestone"></wicket:message></th><td class="edit"><select class="input-large" wicket:id="milestone"></select></td> </wicket:fragment> +<wicket:fragment wicket:id="mergeToFragment"> + <th><wicket:message key="gb.mergeTo"></wicket:message></th><td class="edit"><select class="input-large" wicket:id="mergeto"></select></td> +</wicket:fragment> + </wicket:extend> </html> \ No newline at end of file -- Gitblit v1.9.1