diff options
| author | James Moger <james.moger@gitblit.com> | 2014-03-08 11:53:01 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-03-08 11:53:01 -0500 |
| commit | cc1c3ffa7d261d2e8bcdc600253528e8d09e1d06 (patch) | |
| tree | c28b3765757311f44adba5112ab97f0c06f84846 /src/main/java/com/gitblit/models/UserModel.java | |
| parent | c134a0c3f2440a09c5b8c8c6837c95aba3d4f84f (diff) | |
| download | gitblit-cc1c3ffa7d261d2e8bcdc600253528e8d09e1d06.tar.gz gitblit-cc1c3ffa7d261d2e8bcdc600253528e8d09e1d06.zip | |
Allow selection of integration branch in new ticket page
Diffstat (limited to 'src/main/java/com/gitblit/models/UserModel.java')
| -rw-r--r-- | src/main/java/com/gitblit/models/UserModel.java | 12 |
1 files changed, 9 insertions, 3 deletions
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<UserModel> 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) {
|