Browse Source

Merged #206 "New Ticket Type - Maintenance"

tags/v1.7.0
James Moger 9 years ago
parent
commit
faed6ecc17

+ 2
- 2
src/main/java/com/gitblit/models/TicketModel.java View File

} }


public static enum Type { public static enum Type {
Enhancement, Task, Bug, Proposal, Question;
Enhancement, Task, Bug, Proposal, Question, Maintenance;


public static Type defaultType = Task; public static Type defaultType = Task;


public static Type [] choices() { public static Type [] choices() {
return new Type [] { Enhancement, Task, Bug, Question };
return new Type [] { Enhancement, Task, Bug, Question, Maintenance };
} }


@Override @Override

+ 1
- 0
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties View File

gb.enhancementTickets = enhancements gb.enhancementTickets = enhancements
gb.taskTickets = tasks gb.taskTickets = tasks
gb.questionTickets = questions gb.questionTickets = questions
gb.maintenanceTickets = maintenance
gb.requestTickets = enhancements & tasks gb.requestTickets = enhancements & tasks
gb.yourCreatedTickets = created by you gb.yourCreatedTickets = created by you
gb.yourWatchedTickets = watched by you gb.yourWatchedTickets = watched by you

+ 3
- 0
src/main/java/com/gitblit/wicket/TicketsUI.java View File

case Question: case Question:
WicketUtils.setCssClass(label, "fa fa-question"); WicketUtils.setCssClass(label, "fa fa-question");
break; break;
case Maintenance:
WicketUtils.setCssClass(label, "fa fa-cogs");
break;
default: default:
// standard ticket // standard ticket
WicketUtils.setCssClass(label, "fa fa-ticket"); WicketUtils.setCssClass(label, "fa fa-ticket");

+ 11
- 10
src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html View File

<!-- query list --> <!-- query list -->
<ul class="nav nav-list"> <ul class="nav nav-list">
<li class="nav-header"><wicket:message key="gb.queries"></wicket:message></li> <li class="nav-header"><wicket:message key="gb.queries"></wicket:message></li>
<li><a wicket:id="changesQuery"><i class="fa fa-code-fork"></i> <wicket:message key="gb.proposalTickets"></wicket:message></a></li>
<li><a wicket:id="bugsQuery"><i class="fa fa-bug"></i> <wicket:message key="gb.bugTickets"></wicket:message></a></li>
<li><a wicket:id="enhancementsQuery"><i class="fa fa-magic"></i> <wicket:message key="gb.enhancementTickets"></wicket:message></a></li>
<li><a wicket:id="tasksQuery"><i class="fa fa-ticket"></i> <wicket:message key="gb.taskTickets"></wicket:message></a></li>
<li><a wicket:id="questionsQuery"><i class="fa fa-question"></i> <wicket:message key="gb.questionTickets"></wicket:message></a></li>
<li><a wicket:id="changesQuery"><i class="fa fa-code-fork fa-fw"></i> <wicket:message key="gb.proposalTickets"></wicket:message></a></li>
<li><a wicket:id="bugsQuery"><i class="fa fa-bug fa-fw"></i> <wicket:message key="gb.bugTickets"></wicket:message></a></li>
<li><a wicket:id="enhancementsQuery"><i class="fa fa-magic fa-fw"></i> <wicket:message key="gb.enhancementTickets"></wicket:message></a></li>
<li><a wicket:id="tasksQuery"><i class="fa fa-ticket fa-fw"></i> <wicket:message key="gb.taskTickets"></wicket:message></a></li>
<li><a wicket:id="questionsQuery"><i class="fa fa-question fa-fw"></i> <wicket:message key="gb.questionTickets"></wicket:message></a></li>
<li><a wicket:id="maintenanceQuery"><i class="fa fa-cogs fa-fw"></i> <wicket:message key="gb.maintenanceTickets"></wicket:message></a></li>
<li wicket:id="userDivider" class="divider"></li> <li wicket:id="userDivider" class="divider"></li>
<li><a wicket:id="createdQuery"><i class="fa fa-user"></i> <wicket:message key="gb.yourCreatedTickets"></wicket:message></a></li>
<li><a wicket:id="responsibleQuery"><i class="fa fa-user"></i> <wicket:message key="gb.yourAssignedTickets"></wicket:message></a></li>
<li><a wicket:id="watchedQuery"><i class="fa fa-eye"></i> <wicket:message key="gb.yourWatchedTickets"></wicket:message></a></li>
<li><a wicket:id="mentionsQuery"><i class="fa fa-comment"></i> <wicket:message key="gb.mentionsMeTickets"></wicket:message></a></li>
<li><a wicket:id="createdQuery"><i class="fa fa-user fa-fw"></i> <wicket:message key="gb.yourCreatedTickets"></wicket:message></a></li>
<li><a wicket:id="responsibleQuery"><i class="fa fa-user fa-fw"></i> <wicket:message key="gb.yourAssignedTickets"></wicket:message></a></li>
<li><a wicket:id="watchedQuery"><i class="fa fa-eye fa-fw"></i> <wicket:message key="gb.yourWatchedTickets"></wicket:message></a></li>
<li><a wicket:id="mentionsQuery"><i class="fa fa-comment fa-fw"></i> <wicket:message key="gb.mentionsMeTickets"></wicket:message></a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a wicket:id="resetQuery"><i class="fa fa-bolt"></i> <wicket:message key="gb.reset"></wicket:message></a></li>
<li><a wicket:id="resetQuery"><i class="fa fa-bolt fa-fw"></i> <wicket:message key="gb.reset"></wicket:message></a></li>
</ul> </ul>


</div> </div>

+ 10
- 0
src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java View File

sortBy, sortBy,
desc, desc,
1))); 1)));
add(new BookmarkablePageLink<Void>("maintenanceQuery", MyTicketsPage.class,
queryParameters(
Lucene.type.matches(TicketModel.Type.Maintenance.name()),
milestoneParam,
statiiParam,
assignedToParam,
sortBy,
desc,
1)));


add(new BookmarkablePageLink<Void>("resetQuery", MyTicketsPage.class, add(new BookmarkablePageLink<Void>("resetQuery", MyTicketsPage.class,
queryParameters( queryParameters(

+ 10
- 9
src/main/java/com/gitblit/wicket/pages/TicketsPage.html View File

<div class="hidden-phone"> <div class="hidden-phone">
<ul class="nav nav-list"> <ul class="nav nav-list">
<li class="nav-header"><wicket:message key="gb.queries"></wicket:message></li> <li class="nav-header"><wicket:message key="gb.queries"></wicket:message></li>
<li><a wicket:id="changesQuery"><i class="fa fa-code-fork"></i> <wicket:message key="gb.proposalTickets"></wicket:message></a></li>
<li><a wicket:id="bugsQuery"><i class="fa fa-bug"></i> <wicket:message key="gb.bugTickets"></wicket:message></a></li>
<li><a wicket:id="enhancementsQuery"><i class="fa fa-magic"></i> <wicket:message key="gb.enhancementTickets"></wicket:message></a></li>
<li><a wicket:id="tasksQuery"><i class="fa fa-ticket"></i> <wicket:message key="gb.taskTickets"></wicket:message></a></li>
<li><a wicket:id="questionsQuery"><i class="fa fa-question"></i> <wicket:message key="gb.questionTickets"></wicket:message></a></li>
<li><a wicket:id="changesQuery"><i class="fa fa-code-fork fa-fw"></i> <wicket:message key="gb.proposalTickets"></wicket:message></a></li>
<li><a wicket:id="bugsQuery"><i class="fa fa-bug fa-fw"></i> <wicket:message key="gb.bugTickets"></wicket:message></a></li>
<li><a wicket:id="enhancementsQuery"><i class="fa fa-magic fa-fw"></i> <wicket:message key="gb.enhancementTickets"></wicket:message></a></li>
<li><a wicket:id="tasksQuery"><i class="fa fa-ticket fa-fw"></i> <wicket:message key="gb.taskTickets"></wicket:message></a></li>
<li><a wicket:id="questionsQuery"><i class="fa fa-question fa-fw"></i> <wicket:message key="gb.questionTickets"></wicket:message></a></li>
<li><a wicket:id="maintenanceQuery"><i class="fa fa-cogs fa-fw"></i> <wicket:message key="gb.maintenanceTickets"></wicket:message></a></li>
<li wicket:id="userDivider" class="divider"></li> <li wicket:id="userDivider" class="divider"></li>
<li><a wicket:id="createdQuery"><i class="fa fa-user"></i> <wicket:message key="gb.yourCreatedTickets"></wicket:message></a></li>
<li><a wicket:id="watchedQuery"><i class="fa fa-eye"></i> <wicket:message key="gb.yourWatchedTickets"></wicket:message></a></li>
<li><a wicket:id="mentionsQuery"><i class="fa fa-comment"></i> <wicket:message key="gb.mentionsMeTickets"></wicket:message></a></li>
<li><a wicket:id="createdQuery"><i class="fa fa-user fa-fw"></i> <wicket:message key="gb.yourCreatedTickets"></wicket:message></a></li>
<li><a wicket:id="watchedQuery"><i class="fa fa-eye fa-fw"></i> <wicket:message key="gb.yourWatchedTickets"></wicket:message></a></li>
<li><a wicket:id="mentionsQuery"><i class="fa fa-comment fa-fw"></i> <wicket:message key="gb.mentionsMeTickets"></wicket:message></a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a wicket:id="resetQuery"><i class="fa fa-bolt"></i> <wicket:message key="gb.reset"></wicket:message></a></li>
<li><a wicket:id="resetQuery"><i class="fa fa-bolt fa-fw"></i> <wicket:message key="gb.reset"></wicket:message></a></li>
</ul> </ul>
</div> </div>
<div wicket:id="dynamicQueries" class="hidden-phone"></div> <div wicket:id="dynamicQueries" class="hidden-phone"></div>

+ 10
- 0
src/main/java/com/gitblit/wicket/pages/TicketsPage.java View File

sortBy, sortBy,
desc, desc,
1))); 1)));
add(new BookmarkablePageLink<Void>("maintenanceQuery", TicketsPage.class,
queryParameters(
Lucene.type.matches(TicketModel.Type.Maintenance.name()),
milestoneParam,
statiiParam,
assignedToParam,
sortBy,
desc,
1)));
add(new BookmarkablePageLink<Void>("resetQuery", TicketsPage.class, add(new BookmarkablePageLink<Void>("resetQuery", TicketsPage.class,
queryParameters( queryParameters(

Loading…
Cancel
Save