Merged #182 "Add NO CHANGE REQUIRED ticket status"

gitblit-org · Sep 17, 2014 · 0815f03 · 0815f03
2 parents 802a6b0 + 4881b8a
commit 0815f03
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/com/gitblit/models/TicketModel.java b/src/main/java/com/gitblit/models/TicketModel.java
@@ -1226,13 +1226,13 @@ public static Type fromObject(Object o, Type defaultType) {
 	}
 
 	public static enum Status {
-		New, Open, Closed, Resolved, Fixed, Merged, Wontfix, Declined, Duplicate, Invalid, Abandoned, On_Hold;
+		New, Open, Closed, Resolved, Fixed, Merged, Wontfix, Declined, Duplicate, Invalid, Abandoned, On_Hold, No_Change_Required;
 
-		public static Status [] requestWorkflow = { Open, Resolved, Declined, Duplicate, Invalid, Abandoned, On_Hold };
+		public static Status [] requestWorkflow = { Open, Resolved, Declined, Duplicate, Invalid, Abandoned, On_Hold, No_Change_Required };
 
-		public static Status [] bugWorkflow = { Open, Fixed, Wontfix, Duplicate, Invalid, Abandoned, On_Hold };
+		public static Status [] bugWorkflow = { Open, Fixed, Wontfix, Duplicate, Invalid, Abandoned, On_Hold, No_Change_Required };
 
-		public static Status [] proposalWorkflow = { Open, Resolved, Declined, Abandoned, On_Hold };
+		public static Status [] proposalWorkflow = { Open, Resolved, Declined, Abandoned, On_Hold, No_Change_Required };
 
 		public static Status [] milestoneWorkflow = { Open, Closed, Abandoned, On_Hold };
 

diff --git a/src/main/java/com/gitblit/wicket/TicketsUI.java b/src/main/java/com/gitblit/wicket/TicketsUI.java
@@ -93,6 +93,7 @@ public static String getLozengeClass(Status status, boolean subtle) {
 			css = "aui-lozenge-complete";
 			break;
 		case On_Hold:
+		case No_Change_Required:
 			css = "aui-lozenge-current";
 			break;
 		default:
@@ -122,6 +123,7 @@ public static String getStatusClass(Status status) {
 			css = "resolution-complete";
 			break;
 		case On_Hold:
+		case No_Change_Required:
 			css = "resolution-current";
 			break;
 		default: