Merge "Highlight patch sets that have drafts"

gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java

@@ -176,6 +176,7 @@ public interface GerritCss extends CssResource {
   String patchSetLink();
   String patchSetRevision();
   String patchSetUserIdentity();
+  String patchSetWithDraft();
   String patchSizeCell();
   String pluginsTable();
   String posscore();

gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java

@@ -110,6 +110,11 @@ class PatchSetComplexDisclosurePanel extends ComplexDisclosurePanel
     } else {
       addOpenHandler(this);
     }
+
+    if(ps.getHasDraftComments()) {
+      addStyleName(Gerrit.RESOURCES.css().patchSetWithDraft());
+    }
+
   }
 
   public void setDiffBaseId(PatchSet.Id diffBaseId) {

gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css

@@ -872,6 +872,10 @@ a:hover {
   font-size: 8pt;
 }
 
+.patchSetWithDraft .header td {
+  color: #ff5555;
+}
+
 .changeScreen .gwt-DisclosurePanel .content {
   margin-bottom: 10px;
 }

gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java

@@ -178,6 +178,12 @@ public class ChangeDetailFactory extends Handler<ChangeDetail> {
     ResultSet<PatchSet> source = db.patchSets().byChange(changeId);
     List<PatchSet> patches = new ArrayList<PatchSet>();
     for (PatchSet ps : source) {
+      final CurrentUser user = control.getCurrentUser();
+      if (user instanceof IdentifiedUser) {
+        final Account.Id me = ((IdentifiedUser) user).getAccountId();
+        ps.setHasDraftComments(db.patchComments()
+            .draftByPatchSetAuthor(ps.getId(), me).toList().size() > 0);
+      }
       if (control.isPatchVisible(ps, db)) {
         patches.add(ps);
       }

gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java

@@ -136,6 +136,9 @@ public final class PatchSet {
   @Column(id = 5)
   protected boolean draft;
 
+  /** Not persisted in the database */
+  protected boolean hasDraftComments;
+
   protected PatchSet() {
   }
 
@@ -187,6 +190,14 @@ public final class PatchSet {
     return id.toRefName();
   }
 
+  public boolean getHasDraftComments() {
+    return hasDraftComments;
+  }
+
+  public void setHasDraftComments(boolean hasDraftComments) {
+    this.hasDraftComments = hasDraftComments;
+  }
+
   @Override
   public String toString() {
     return "[PatchSet " + getId().toString() + "]";