From 06eb51f13d9dcd4e4e5d9d7bb0db4cf18a67b23e 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] Allow integration (mergeTo) branch to be changed in edit ticket --- src/main/java/com/gitblit/wicket/pages/EditTicketPage.html | 5 +++++ 1 files changed, 5 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..424eece 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.html +++ b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.html @@ -41,6 +41,7 @@ <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 wicket:id="responsible"></tr> <tr wicket:id="milestone"></tr> + <tr wicket:id="mergeto"></tr> </table> </div> </div> @@ -62,5 +63,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