opendev/gerrit
Code Issues Proposed changes

Merge "Make ChangeControl#canDelete(ReviewDb, Change.Status) private"

Browse Source
This commit is contained in:
David Pursehouse
2017-08-28 16:04:23 +00:00
committed by Gerrit Code Review
parent d170ce9e02 183896b1e9
commit d901cac677
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftPatchSet.java
View File

@@ -135,7 +135,7 @@ public class DeleteDraftPatchSet
if (!allowDrafts) { if (!allowDrafts) {
throw new MethodNotAllowedException("Draft workflow is disabled"); throw new MethodNotAllowedException("Draft workflow is disabled");
} }
if (!ctx.getControl().canDelete(ctx.getDb(), Change.Status.DRAFT)) { if (!ctx.getControl().canDeleteDraft(ctx.getDb())) {
throw new AuthException("Not permitted to delete this draft patch set"); throw new AuthException("Not permitted to delete this draft patch set");
} }
@@ -220,7 +220,7 @@ public class DeleteDraftPatchSet
allowDrafts allowDrafts
&& rsrc.getPatchSet().isDraft() && rsrc.getPatchSet().isDraft()
&& psUtil.byChange(db.get(), rsrc.getNotes()).size() > 1 && psUtil.byChange(db.get(), rsrc.getNotes()).size() > 1
&& rsrc.getControl().canDelete(db.get(), Change.Status.DRAFT)); && rsrc.getControl().canDeleteDraft(db.get()));
} catch (OrmException e) { } catch (OrmException e) {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }

8
gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
View File

@@ -234,8 +234,14 @@ public class ChangeControl {
return (isOwner() || getRefControl().canPublishDrafts()) && isVisible(db); return (isOwner() || getRefControl().canPublishDrafts()) && isVisible(db);
} }
/** Can this user delete this draft change or any patch set of this change? */
public boolean canDeleteDraft(ReviewDb db) throws OrmException {
// TODO(hiesel) These don't need to be migrated, just remove after support for drafts is removed
return canDelete(db, Change.Status.DRAFT);
}
/** Can this user delete this change or any patch set of this change? */ /** Can this user delete this change or any patch set of this change? */
public boolean canDelete(ReviewDb db, Change.Status status) throws OrmException { private boolean canDelete(ReviewDb db, Change.Status status) throws OrmException {
if (!isVisible(db)) { if (!isVisible(db)) {
return false; return false;
} }