From cc1c3ffa7d261d2e8bcdc600253528e8d09e1d06 Mon Sep 17 00:00:00 2001 From: James Moger Date: Sat, 8 Mar 2014 11:53:01 -0500 Subject: Allow selection of integration branch in new ticket page --- src/main/java/com/gitblit/models/UserModel.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/gitblit/models/UserModel.java') diff --git a/src/main/java/com/gitblit/models/UserModel.java b/src/main/java/com/gitblit/models/UserModel.java index fee9c172..675835d3 100644 --- a/src/main/java/com/gitblit/models/UserModel.java +++ b/src/main/java/com/gitblit/models/UserModel.java @@ -449,9 +449,15 @@ public class UserModel implements Principal, Serializable, Comparable public boolean canEdit(TicketModel ticket, RepositoryModel repository) { return isAuthenticated() && - (username.equals(ticket.createdBy) - || username.equals(ticket.responsible) - || canPush(repository)); + (canPush(repository) + || (ticket != null && username.equals(ticket.responsible)) + || (ticket != null && username.equals(ticket.createdBy))); + } + + public boolean canAdmin(TicketModel ticket, RepositoryModel repository) { + return isAuthenticated() && + (canPush(repository) + || ticket != null && username.equals(ticket.responsible)); } public boolean canReviewPatchset(RepositoryModel model) { -- cgit v1.2.3