Clarify draft changes and draft comments

We show the draft changes the user has when he clicks the drafts
the old functionality is moved to draft comments.

Change-Id: Ic0ab6ee8452f2bb745b655f7982afb00980d7922
This commit is contained in:
Deniz Türkoglu
2012-05-10 11:20:56 -07:00
parent 2e16cf4eef
commit d6799b1d40
6 changed files with 22 additions and 2 deletions

View File

@@ -16,9 +16,10 @@ matches the search, the change will be presented instead of a list.
|All > Open | status:open '(or is:open)' |All > Open | status:open '(or is:open)'
|All > Merged | status:merged |All > Merged | status:merged
|All > Abandoned | status:abandoned |All > Abandoned | status:abandoned
|My > Dafts | has:draft |My > Drafts | is:draft
|My > Watched Changes | status:open is:watched |My > Watched Changes | status:open is:watched
|My > Starred Changes | is:starred |My > Starred Changes | is:starred
|My > Draft Comments | has:draft
|Open changes in Foo | status:open project:Foo |Open changes in Foo | status:open project:Foo
|================================================= |=================================================
@@ -230,6 +231,10 @@ is:open::
+ +
True if the change is other open or submitted, merge pending. True if the change is other open or submitted, merge pending.
is:draft::
+
True if the change is a draft.
is:closed:: is:closed::
+ +
True if the change is either merged or abandoned. True if the change is either merged or abandoned.

View File

@@ -235,6 +235,10 @@ public class Dispatcher {
} }
if (matchExact("mine,drafts", token)) { if (matchExact("mine,drafts", token)) {
return PageLinks.toChangeQuery("is:draft");
}
if (matchExact("mine,comments", token)) {
return PageLinks.toChangeQuery("has:draft"); return PageLinks.toChangeQuery("has:draft");
} }

View File

@@ -548,9 +548,10 @@ public class Gerrit implements EntryPoint {
if (signedIn) { if (signedIn) {
m = new LinkMenuBar(); m = new LinkMenuBar();
addLink(m, C.menuMyChanges(), PageLinks.MINE); addLink(m, C.menuMyChanges(), PageLinks.MINE);
addLink(m, C.menuMyDrafts(), PageLinks.toChangeQuery("has:draft")); addLink(m, C.menuMyDrafts(), PageLinks.toChangeQuery("is:draft"));
addLink(m, C.menuMyWatchedChanges(), PageLinks.toChangeQuery("is:watched status:open")); addLink(m, C.menuMyWatchedChanges(), PageLinks.toChangeQuery("is:watched status:open"));
addLink(m, C.menuMyStarredChanges(), PageLinks.toChangeQuery("is:starred")); addLink(m, C.menuMyStarredChanges(), PageLinks.toChangeQuery("is:starred"));
addLink(m, C.menuMyDraftComments(), PageLinks.toChangeQuery("has:draft"));
menuLeft.add(m, C.menuMine()); menuLeft.add(m, C.menuMine());
menuLeft.selectTab(1); menuLeft.selectTab(1);
} else { } else {

View File

@@ -60,6 +60,7 @@ public interface GerritConstants extends Constants {
String menuMyDrafts(); String menuMyDrafts();
String menuMyWatchedChanges(); String menuMyWatchedChanges();
String menuMyStarredChanges(); String menuMyStarredChanges();
String menuMyDraftComments();
String menuDiff(); String menuDiff();
String menuDiffCommit(); String menuDiffCommit();
@@ -96,4 +97,5 @@ public interface GerritConstants extends Constants {
String jumpMineDrafts(); String jumpMineDrafts();
String jumpMineWatched(); String jumpMineWatched();
String jumpMineStarred(); String jumpMineStarred();
String jumpMineDraftComments();
} }

View File

@@ -43,6 +43,7 @@ menuMyChanges = Changes
menuMyDrafts = Drafts menuMyDrafts = Drafts
menuMyStarredChanges = Starred Changes menuMyStarredChanges = Starred Changes
menuMyWatchedChanges = Watched Changes menuMyWatchedChanges = Watched Changes
menuMyDraftComments = Draft Comments
menuDiff = Differences menuDiff = Differences
menuDiffCommit = Commit Message menuDiffCommit = Commit Message
@@ -79,3 +80,4 @@ jumpMine = Go to my dashboard
jumpMineWatched = Go to watched changes jumpMineWatched = Go to watched changes
jumpMineDrafts = Go to drafts jumpMineDrafts = Go to drafts
jumpMineStarred = Go to starred changes jumpMineStarred = Go to starred changes
jumpMineDraftComments = Go to draft comments

View File

@@ -53,6 +53,12 @@ class JumpKeys {
} }
}); });
jumps.add(new KeyCommand(0, 'd', Gerrit.C.jumpMineDrafts()) { jumps.add(new KeyCommand(0, 'd', Gerrit.C.jumpMineDrafts()) {
@Override
public void onKeyPress(final KeyPressEvent event) {
Gerrit.display(PageLinks.toChangeQuery("is:draft"));
}
});
jumps.add(new KeyCommand(0, 'c', Gerrit.C.jumpMineDraftComments()) {
@Override @Override
public void onKeyPress(final KeyPressEvent event) { public void onKeyPress(final KeyPressEvent event) {
Gerrit.display(PageLinks.toChangeQuery("has:draft")); Gerrit.display(PageLinks.toChangeQuery("has:draft"));