opendev/gerrit
Code Issues Proposed changes

ChangeScreen2: Rename Submit to Merge Change

Browse Source 
Submit can be confusing for new users, it can be misread as submit
the change to reviewers for review and consideration. Relabel the
button as "Merge Change", which should scare someone a bit more
before clicking.

Update the hover title to include the branch its going to submit to.

Change-Id: Ibe35479424b09f66f69b4c59a3d2361a85b331d9
This commit is contained in:
Shawn Pearce
2013-12-17 15:28:40 -08:00
parent 79d4ebec49
commit 7dd52e61e0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
View File

@@ -149,8 +149,9 @@ public class Submit implements RestModifyView<RevisionResource, SubmitInput>,
PatchSet.Id current = resource.getChange().currentPatchSetId();
return new UiAction.Description()
.setTitle(String.format(
"Submit revision %d",
resource.getPatchSet().getPatchSetId()))
"Merge patch set %d into %s",
resource.getPatchSet().getPatchSetId(),
resource.getChange().getDest().getShortName()))
.setVisible(resource.getChange().getStatus().isOpen()
&& resource.getPatchSet().getId().equals(current)
&& resource.getControl().canSubmit());