opendev/gerrit
Code Issues Proposed changes

Fix crossed notify toggles for project watches

Browse Source 
The submit and new changes buttons were cross-wired, causing the one
to impact the other's value.  Fix that, and while we are at it clarify
the names involved so there is less confusion going on.

Change-Id: Ie1b082e35b7a95913a7feb92739f79220a24a983
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2010-11-15 12:06:42 -08:00
parent 887bc2d59f
commit 6819cef106
5 changed files with 33 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchesTable.java
View File

@@ -134,9 +134,9 @@ public class MyWatchesTable extends FancyFlexTable<AccountProjectWatchInfo> {
table.setWidget(row, 1, new CheckBox());
table.setWidget(row, 2, fp);
addNotifyButton(AccountProjectWatch.Type.NEW_CHANGES, info, row, 3);
addNotifyButton(AccountProjectWatch.Type.COMMENTS, info, row, 4);
addNotifyButton(AccountProjectWatch.Type.SUBMITS, info, row, 5);
addNotifyButton(AccountProjectWatch.NotifyType.NEW_CHANGES, info, row, 3);
addNotifyButton(AccountProjectWatch.NotifyType.ALL_COMMENTS, info, row, 4);
addNotifyButton(AccountProjectWatch.NotifyType.SUBMITTED_CHANGES, info, row, 5);
final FlexCellFormatter fmt = table.getFlexCellFormatter();
fmt.addStyleName(row, 1, Gerrit.RESOURCES.css().iconCell());
@@ -148,7 +148,7 @@ public class MyWatchesTable extends FancyFlexTable<AccountProjectWatchInfo> {
setRowItem(row, info);
}
protected void addNotifyButton(final AccountProjectWatch.Type type,
protected void addNotifyButton(final AccountProjectWatch.NotifyType type,
final AccountProjectWatchInfo info, final int row, final int col) {
final CheckBox cbox = new CheckBox();
@@ -157,13 +157,16 @@ public class MyWatchesTable extends FancyFlexTable<AccountProjectWatchInfo> {
public void onClick(final ClickEvent event) {
final boolean oldVal = info.getWatch().isNotify(type);
info.getWatch().setNotify(type, cbox.getValue());
cbox.setEnabled(false);
Util.ACCOUNT_SVC.updateProjectWatch(info.getWatch(),
new GerritCallback<VoidResult>() {
public void onSuccess(final VoidResult result) {
cbox.setEnabled(true);
}
@Override
public void onFailure(final Throwable caught) {
cbox.setEnabled(true);
info.getWatch().setNotify(type, oldVal);
cbox.setValue(oldVal);
super.onFailure(caught);