opendev/gerrit
Code Issues Proposed changes

Merge "Change default comment visibility to expand all recent comments"

Browse Source
This commit is contained in:
Shawn Pearce
2013-05-18 00:54:02 +00:00
committed by Gerrit Code Review
parent 322cecbe61 614675be0d
commit 84e6dd3541
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
View File

@@ -218,7 +218,7 @@ public class MyPreferencesScreen extends SettingsScreen {
p.getTimeFormat());
relativeDateInChangeTable.setValue(p.isRelativeDateInChangeTable());
setListBox(commentVisibilityStrategy,
AccountGeneralPreferences.CommentVisibilityStrategy.EXPAND_MOST_RECENT,
AccountGeneralPreferences.CommentVisibilityStrategy.EXPAND_RECENT,
p.getCommentVisibilityStrategy());
}
@@ -285,7 +285,7 @@ public class MyPreferencesScreen extends SettingsScreen {
AccountGeneralPreferences.TimeFormat.values()));
p.setRelativeDateInChangeTable(relativeDateInChangeTable.getValue());
p.setCommentVisibilityStrategy(getListBox(commentVisibilityStrategy,
CommentVisibilityStrategy.EXPAND_MOST_RECENT,
CommentVisibilityStrategy.EXPAND_RECENT,
CommentVisibilityStrategy.values()));
enable(false);

10
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
View File

@@ -408,7 +408,7 @@ public class ChangeScreen extends Screen
final Timestamp aged = new Timestamp(System.currentTimeMillis() - AGE);
CommentVisibilityStrategy commentVisibilityStrategy =
CommentVisibilityStrategy.EXPAND_MOST_RECENT;
CommentVisibilityStrategy.EXPAND_RECENT;
if (Gerrit.isSignedIn()) {
commentVisibilityStrategy = Gerrit.getUserAccount()
.getGeneralPreferences().getCommentVisibilityStrategy();
@@ -443,16 +443,16 @@ public class ChangeScreen extends Screen
switch (commentVisibilityStrategy) {
case COLLAPSE_ALL:
break;
case EXPAND_RECENT:
isOpen = isRecent;
break;
case EXPAND_ALL:
isOpen = true;
break;
case EXPAND_MOST_RECENT:
default:
isOpen = i == msgList.size() - 1;
break;
case EXPAND_RECENT:
default:
isOpen = isRecent;
break;
}
cp.setOpen(isOpen);
comments.add(cp);