diff options
| author | mrbytes <eguervos@msn.com> | 2014-03-08 18:10:58 +0100 |
|---|---|---|
| committer | mrbytes <eguervos@msn.com> | 2014-03-08 18:10:58 +0100 |
| commit | 6be15a1cac2f98585174f501879c3685ef2a54b6 (patch) | |
| tree | 1bba38af1d25856ea29bf205acb2f93f73c7dd94 /src/main/java/com/gitblit/models/UserModel.java | |
| parent | eb6f5022fa0b4906392eb6c01e859440de21505f (diff) | |
| parent | b919a7f3f5b8415df7d237b1644193430a64f299 (diff) | |
| download | gitblit-6be15a1cac2f98585174f501879c3685ef2a54b6.tar.gz gitblit-6be15a1cac2f98585174f501879c3685ef2a54b6.zip | |
Merge branch 'master' of https://github.com/gitblit/gitblit
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) {
|