From 706251150991341c004b86831154970402b515e5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 11 Mar 2014 10:22:33 -0400
Subject: [PATCH] Add closed status for milestones and abandoned status for tickets
---
src/main/java/com/gitblit/wicket/pages/TicketsPage.java | 3 ++-
src/main/java/com/gitblit/models/TicketModel.java | 10 ++++++----
src/main/java/com/gitblit/wicket/pages/TicketBasePage.java | 2 ++
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/models/TicketModel.java b/src/main/java/com/gitblit/models/TicketModel.java
index 5fd1ed9..fa09ec5 100644
--- a/src/main/java/com/gitblit/models/TicketModel.java
+++ b/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() {
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketBasePage.java b/src/main/java/com/gitblit/wicket/pages/TicketBasePage.java
index 3736cdd..60fa638 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketBasePage.java
+++ b/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:
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
index 489ed1a..3e8e4ed 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
+++ b/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;
--
Gitblit v1.9.1