opendev/gerrit
Code Issues Proposed changes

InlineEdit: Preserve active edit mode on change screen reload

Browse Source 
Change-Id: I764772b55f20ccc7565aa3eb15785d0a0425914f
This commit is contained in:
David Ostrovsky
2014-09-10 01:08:04 +02:00
parent a6d66c9b8f
commit 8762126fa6
6 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
View File

@@ -66,6 +66,7 @@ import com.google.gerrit.client.admin.ProjectListScreen;
import com.google.gerrit.client.admin.ProjectScreen;
import com.google.gerrit.client.api.ExtensionScreen;
import com.google.gerrit.client.change.ChangeScreen2;
import com.google.gerrit.client.change.FileTable;
import com.google.gerrit.client.changes.AccountDashboardScreen;
import com.google.gerrit.client.changes.ChangeScreen;
import com.google.gerrit.client.changes.CustomDashboardScreen;
@@ -535,9 +536,15 @@ public class Dispatcher {
}
if (rest.isEmpty()) {
Gerrit.display(token, panel== null
FileTable.Mode mode = FileTable.Mode.REVIEW;
if (panel != null
&& (panel.equals("edit") || panel.startsWith("edit/"))) {
mode = FileTable.Mode.EDIT;
panel = null;
}
Gerrit.display(token, panel == null
? (isChangeScreen2()
? new ChangeScreen2(id, null, null, false)
? new ChangeScreen2(id, null, null, false, mode)
: new ChangeScreen(id))
: new NotFoundScreen());
return;
@@ -585,7 +592,7 @@ public class Dispatcher {
base != null
? String.valueOf(base.get())
: null,
String.valueOf(ps.get()), false)
String.valueOf(ps.get()), false, FileTable.Mode.REVIEW)
: new ChangeScreen(id));
} else if ("publish".equals(panel)) {
publish(ps);