Add closed status for milestones and abandoned status for tickets

diff --git a/src/main/java/com/gitblit/models/TicketModel.java b/src/main/java/com/gitblit/models/TicketModel.java
index 5fd1ed958b05ad81bb0445c5d4a8955a5d382dd1..fa09ec597bcd5e100e3e498eaffbe52968c8be7a 100644 (file)
--- a/src/main/java/com/gitblit/models/TicketModel.java
+++ b/src/main/java/com/gitblit/models/TicketModel.java
@@ -1201,13 +1201,15 @@ public class TicketModel implements Serializable, Comparable<TicketModel> {
        }
 
        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() {

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketBasePage.java b/src/main/java/com/gitblit/wicket/pages/TicketBasePage.java
index 3736cddf127d6b8c9eebbf6b240ac614d9e1cc88..60fa6381818e26caffd930ca962cefec4c9a73b5 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/TicketBasePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketBasePage.java
@@ -73,6 +73,7 @@ public abstract class TicketBasePage extends RepositoryPage {
                case Duplicate:\r
                case Invalid:\r
                case Wontfix:\r
+               case Abandoned:\r
                        css = "aui-lozenge-error";\r
                        break;\r
                case Fixed:\r
@@ -101,6 +102,7 @@ public abstract class TicketBasePage extends RepositoryPage {
                case Duplicate:\r
                case Invalid:\r
                case Wontfix:\r
+               case Abandoned:\r
                        css = "resolution-error";\r
                        break;\r
                case Fixed:\r

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
index 489ed1aca316a635e55dfe8408f709285254a2dc..3e8e4edd4064a7d6d1d1bb31e381d4fe8ec60c27 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
@@ -397,7 +397,8 @@ public class TicketsPage extends TicketBasePage {
                add(new BookmarkablePageLink<Void>("allTickets", TicketsPage.class, queryParameters(queryParam, milestoneParam, null, assignedToParam, sortBy, desc, 1)));\r
 \r
                // by status\r
-               List<Status> statii = Arrays.asList(Status.values());\r
+               List<Status> statii = new ArrayList<Status>(Arrays.asList(Status.values()));\r
+               statii.remove(Status.Closed);\r
                ListDataProvider<Status> resolutionsDp = new ListDataProvider<Status>(statii);\r
                DataView<Status> statiiLinks = new DataView<Status>("statii", resolutionsDp) {\r
                        private static final long serialVersionUID = 1L;\r