Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14748375
D18625.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
3 KB
Referenced Files
None
Subscribers
None
D18625.diff
View Options
diff --git a/src/applications/differential/constants/DifferentialRevisionStatus.php b/src/applications/differential/constants/DifferentialRevisionStatus.php
--- a/src/applications/differential/constants/DifferentialRevisionStatus.php
+++ b/src/applications/differential/constants/DifferentialRevisionStatus.php
@@ -8,6 +8,7 @@
const ACCEPTED = 'accepted';
const PUBLISHED = 'published';
const ABANDONED = 'abandoned';
+ const DRAFT = 'draft';
private $key;
private $spec = array();
@@ -76,6 +77,10 @@
return ($this->key === self::CHANGES_PLANNED);
}
+ public function isDraft() {
+ return ($this->key === self::DRAFT);
+ }
+
public static function newForStatus($status) {
$result = new self();
@@ -163,6 +168,16 @@
'color.tag' => 'indigo',
'color.ansi' => null,
),
+ self::DRAFT => array(
+ 'name' => pht('Draft'),
+ // For legacy clients, treat this as though it is "Needs Review".
+ 'legacy' => 0,
+ 'icon' => 'fa-file-text-o',
+ 'closed' => false,
+ 'color.icon' => 'grey',
+ 'color.tag' => 'grey',
+ 'color.ansi' => null,
+ ),
);
}
diff --git a/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php b/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
--- a/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
+++ b/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
@@ -37,6 +37,9 @@
// other project or package reviewers which they have authority over.
$this->filterResigned($phids);
+ // We also throw away draft revisions which you aren't the author of.
+ $this->filterOtherDrafts($phids);
+
$groups = array();
$groups[] = $this->newGroup()
@@ -61,6 +64,11 @@
->setNoDataString(pht('No revisions are waiting for updates.'))
->setObjects($this->filterShouldUpdate($phids));
+ $groups[] = $this->newGroup()
+ ->setName(pht('Drafts'))
+ ->setNoDataString(pht('You have no draft revisions.'))
+ ->setObjects($this->filterDrafts($phids));
+
$groups[] = $this->newGroup()
->setName(pht('Waiting on Review'))
->setNoDataString(pht('None of your revisions are waiting on review.'))
@@ -247,4 +255,36 @@
return $results;
}
+ private function filterOtherDrafts(array $phids) {
+ $objects = $this->getRevisionsNotAuthored($this->objects, $phids);
+
+ $results = array();
+ foreach ($objects as $key => $object) {
+ if (!$object->isDraft()) {
+ continue;
+ }
+
+ $results[$key] = $object;
+ unset($this->objects[$key]);
+ }
+
+ return $results;
+ }
+
+ private function filterDrafts(array $phids) {
+ $objects = $this->getRevisionsAuthored($this->objects, $phids);
+
+ $results = array();
+ foreach ($objects as $key => $object) {
+ if (!$object->isDraft()) {
+ continue;
+ }
+
+ $results[$key] = $object;
+ unset($this->objects[$key]);
+ }
+
+ return $results;
+ }
+
}
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -653,6 +653,10 @@
return $this->getStatusObject()->isPublished();
}
+ public function isDraft() {
+ return $this->getStatusObject()->isDraft();
+ }
+
public function getStatusIcon() {
return $this->getStatusObject()->getIcon();
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Jan 22, 10:36 AM (10 h, 32 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7030743
Default Alt Text
D18625.diff (3 KB)
Attached To
Mode
D18625: Add a "Draft" state for revisions, and action bucket support
Attached
Detach File
Event Timeline
Log In to Comment