commit f8f4d34f2950fecd6ac88ee8cc303af193ab2203
author Ben Rohlfs <brohlfs@google.com> Tue Dec 01 08:20:26 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 01 08:20:26 2020 +0000
tree 5c4dbc9331f9e181f2b9f10bbd0af3ce50e099d7
parent 40c71a2df3adf527e9ae5b007d8d98df6419e7b3
parent 56f7e79153f0ee17d7ac3192d75481015e83e773

Merge "Remove requesting DETAILED_LABELS for the dashboard"

java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java

diff --git a/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java b/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java
index c17cd97..f1da6b7 100644
--- a/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java
+++ b/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java
@@ -123,9 +123,7 @@
     options.add(ListChangesOption.LABELS);
     options.add(ListChangesOption.DETAILED_ACCOUNTS);
 
-    if (isEnabledAttentionSet(serverApi)) {
-      options.add(ListChangesOption.DETAILED_LABELS);
-    } else {
+    if (!isEnabledAttentionSet(serverApi)) {
       options.add(ListChangesOption.REVIEWED);
     }
     return ListOption.toHex(options);

polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts

diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts
index 0ec9aaf..5ffdfe2 100644
--- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts
+++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts
@@ -1424,9 +1424,7 @@
       ListChangesOption.LABELS,
       ListChangesOption.DETAILED_ACCOUNTS,
     ];
-    if (config?.change && config.change.enable_attention_set) {
-      options.push(ListChangesOption.DETAILED_LABELS);
-    } else {
+    if (!config?.change?.enable_attention_set) {
       options.push(ListChangesOption.REVIEWED);
     }