From: James Moger Date: Wed, 17 Sep 2014 18:22:41 +0000 (-0400) Subject: Add NO CHANGE REQUIRED ticket status X-Git-Tag: v1.6.1~29^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Ftickets%2F82%2F182%2F1;p=gitblit.git Add NO CHANGE REQUIRED ticket status --- diff --git a/src/main/java/com/gitblit/models/TicketModel.java b/src/main/java/com/gitblit/models/TicketModel.java index 091a669f..a4880ead 100644 --- a/src/main/java/com/gitblit/models/TicketModel.java +++ b/src/main/java/com/gitblit/models/TicketModel.java @@ -1226,13 +1226,13 @@ public class TicketModel implements Serializable, Comparable { } 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 index a243a7b3..0eff4cff 100644 --- a/src/main/java/com/gitblit/wicket/TicketsUI.java +++ b/src/main/java/com/gitblit/wicket/TicketsUI.java @@ -93,6 +93,7 @@ public class TicketsUI { css = "aui-lozenge-complete"; break; case On_Hold: + case No_Change_Required: css = "aui-lozenge-current"; break; default: @@ -122,6 +123,7 @@ public class TicketsUI { css = "resolution-complete"; break; case On_Hold: + case No_Change_Required: css = "resolution-current"; break; default: