Merged #25 "Add closed status for milestones and abandoned status for tickets"

James Moger

2014-03-11 16a739b35838da85d2194493a6764631c344adac

Merged #25 "Add closed status for milestones and abandoned status for tickets"

 src/main/java/com/gitblit/models/TicketModel.java

@@ -1201,13 +1201,15 @@
    }

    public static enum Status {
        New, Open, Resolved, Fixed, Merged, Wontfix, Declined, Duplicate, Invalid, On_Hold;
        New, Open, Closed, Resolved, Fixed, Merged, Wontfix, Declined, Duplicate, Invalid, Abandoned, On_Hold;

        public static Status [] requestWorkflow = { Open, Resolved, Declined, Duplicate, Invalid, On_Hold };
        public static Status [] requestWorkflow = { Open, Resolved, Declined, Duplicate, Invalid, Abandoned, On_Hold };

        public static Status [] bugWorkflow = { Open, Fixed, Wontfix, Duplicate, Invalid, On_Hold };
        public static Status [] bugWorkflow = { Open, Fixed, Wontfix, Duplicate, Invalid, Abandoned, On_Hold };

        public static Status [] proposalWorkflow = { Open, Resolved, Declined, On_Hold};
        public static Status [] proposalWorkflow = { Open, Resolved, Declined, Abandoned, On_Hold };

        public static Status [] milestoneWorkflow = { Open, Closed, Abandoned, On_Hold };

        @Override
        public String toString() {

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

@@ -73,6 +73,7 @@
        case Duplicate:

        case Invalid:

        case Wontfix:

        case Abandoned:

            css = "aui-lozenge-error";

            break;

        case Fixed:

@@ -101,6 +102,7 @@
        case Duplicate:

        case Invalid:

        case Wontfix:

        case Abandoned:

            css = "resolution-error";

            break;

        case Fixed:


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

@@ -397,7 +397,8 @@
        add(new BookmarkablePageLink<Void>("allTickets", TicketsPage.class, queryParameters(queryParam, milestoneParam, null, assignedToParam, sortBy, desc, 1)));



        // by status

        List<Status> statii = Arrays.asList(Status.values());

        List<Status> statii = new ArrayList<Status>(Arrays.asList(Status.values()));

        statii.remove(Status.Closed);

        ListDataProvider<Status> resolutionsDp = new ListDataProvider<Status>(statii);

        DataView<Status> statiiLinks = new DataView<Status>("statii", resolutionsDp) {

            private static final long serialVersionUID = 1L;