diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-17 14:23:01 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-17 14:23:01 -0400 |
| commit | 588a4f925f5ac6ff80674c047bf147528cb8bbb3 (patch) | |
| tree | 02ff25f77c4275da53a60669d3c9e69d48ea313f /src/main/java/com | |
| parent | 61865af823fe31f477eac413e9cc7cb6390241c3 (diff) | |
| parent | 4881b8a72e9bbd51d484c769bf1aa72f1f77aeec (diff) | |
| download | gitblit-588a4f925f5ac6ff80674c047bf147528cb8bbb3.tar.gz gitblit-588a4f925f5ac6ff80674c047bf147528cb8bbb3.zip | |
Merge branch 'ticket/182' into develop
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/gitblit/models/TicketModel.java | 8 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/TicketsUI.java | 2 |
2 files changed, 6 insertions, 4 deletions
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<TicketModel> { } 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: |