Delegate closed ticket changes to the Edit Ticket page

James Moger

2014-03-05 85775acd760c668a73f9febf80009832ddf91af9

Delegate closed ticket changes to the Edit Ticket page

 src/main/java/com/gitblit/wicket/pages/TicketPage.html

@@ -136,8 +136,8 @@
</wicket:fragment>





<!-- TICKET CONTROLS FRAGMENT -->

<wicket:fragment wicket:id="controlsFragment">

<!-- OPEN TICKET CONTROLS FRAGMENT -->

<wicket:fragment wicket:id="openControlsFragment">

    <div class="hidden-phone hidden-tablet">

        <div class="btn-group" style="display:inline-block;">

            <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><wicket:message key="gb.status"></wicket:message> <span class="caret"></span></a>

@@ -167,6 +167,17 @@
</wicket:fragment>





<!-- CLOSED TICKET CONTROLS FRAGMENT -->

<wicket:fragment wicket:id="closedControlsFragment">

    <div class="hidden-phone hidden-tablet">

		
        <div class="btn-group" style="display:inline-block;">

            <a class="btn btn-small" wicket:id="editLink"></a>

        </div>

    </div>

</wicket:fragment>





<!-- STATUS INDICATOR FRAGMENT -->

<wicket:fragment wicket:id="ticketStatusFragment">

    <div style="font-size:2.5em;padding-bottom: 5px;">


 src/main/java/com/gitblit/wicket/pages/TicketPage.java

@@ -328,17 +328,17 @@
         * UPDATE FORM (DISCUSSION TAB)

         */

        if (isAuthenticated && app().tickets().isAcceptingTicketUpdates(repository)) {

            Fragment controls = new Fragment("controls", "controlsFragment", this);



            if (ticket.isOpen()) {

                /*

                 * OPEN TICKET

                 */

                Fragment controls = new Fragment("controls", "openControlsFragment", this);



            /*

             * STATUS

             */

            List<Status> choices = new ArrayList<Status>();

            if (ticket.isClosed()) {

                // re-open

                choices.addAll(Arrays.asList(TicketModel.Status.Open));

            } else if (ticket.isProposal()) {

                if (ticket.isProposal()) {

                choices.addAll(Arrays.asList(TicketModel.Status.proposalWorkflow));

            } else if (ticket.isBug()) {

                choices.addAll(Arrays.asList(TicketModel.Status.bugWorkflow));

@@ -482,6 +482,17 @@


            add(controls);

        } else {

                /*

                 * CLOSED TICKET

                 */

                Fragment controls = new Fragment("controls", "closedControlsFragment", this);



                String editHref = urlFor(EditTicketPage.class, params).toString();

                controls.add(new ExternalLink("editLink", editHref, getString("gb.edit")));



                add(controls);

            }

        } else {

            add(new Label("controls").setVisible(false));

        }