Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15397100
D15280.id36868.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
9 KB
Referenced Files
None
Subscribers
None
D15280.id36868.diff
View Options
diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
@@ -162,19 +162,32 @@
private function renderWatchAction(PhabricatorProject $project) {
$viewer = $this->getViewer();
- $viewer_phid = $viewer->getPHID();
$id = $project->getID();
- $is_watcher = ($viewer_phid && $project->isUserWatcher($viewer_phid));
+ if (!$viewer->isLoggedIn()) {
+ $is_watcher = false;
+ $is_ancestor = false;
+ } else {
+ $viewer_phid = $viewer->getPHID();
+ $is_watcher = $project->isUserWatcher($viewer_phid);
+ $is_ancestor = $project->isUserAncestorWatcher($viewer_phid);
+ }
- if (!$is_watcher) {
+ if ($is_ancestor && !$is_watcher) {
+ $watch_icon = 'fa-eye';
+ $watch_text = pht('Watching Ancestor');
+ $watch_href = "/project/watch/{$id}/?via=profile";
+ $watch_disabled = true;
+ } else if (!$is_watcher) {
$watch_icon = 'fa-eye';
$watch_text = pht('Watch Project');
$watch_href = "/project/watch/{$id}/?via=profile";
+ $watch_disabled = false;
} else {
$watch_icon = 'fa-eye-slash';
$watch_text = pht('Unwatch Project');
$watch_href = "/project/unwatch/{$id}/?via=profile";
+ $watch_disabled = false;
}
$watch_icon = id(new PHUIIconView())
@@ -185,7 +198,8 @@
->setWorkflow(true)
->setIcon($watch_icon)
->setText($watch_text)
- ->setHref($watch_href);
+ ->setHref($watch_href)
+ ->setDisabled($watch_disabled);
}
private function buildMilestoneList(PhabricatorProject $project) {
diff --git a/src/applications/project/controller/PhabricatorProjectWatchController.php b/src/applications/project/controller/PhabricatorProjectWatchController.php
--- a/src/applications/project/controller/PhabricatorProjectWatchController.php
+++ b/src/applications/project/controller/PhabricatorProjectWatchController.php
@@ -25,6 +25,23 @@
$done_uri = "/project/members/{$id}/";
}
+ $is_watcher = $project->isUserWatcher($viewer->getPHID());
+ $is_ancestor = $project->isUserAncestorWatcher($viewer->getPHID());
+ if ($is_ancestor && !$is_watcher) {
+ $ancestor_phid = $project->getWatchedAncestorPHID($viewer->getPHID());
+ $handles = $viewer->loadHandles(array($ancestor_phid));
+ $ancestor_handle = $handles[$ancestor_phid];
+
+ return $this->newDialog()
+ ->setTitle(pht('Watching Ancestor'))
+ ->appendParagraph(
+ pht(
+ 'You are already watching %s, an ancestor of this project, and '.
+ 'are thus watching all of its subprojects.',
+ $ancestor_handle->renderTag()->render()))
+ ->addCancelbutton($done_uri);
+ }
+
if ($request->isDialogFormPost()) {
$edge_action = null;
switch ($action) {
@@ -61,10 +78,14 @@
switch ($action) {
case 'watch':
$title = pht('Watch Project?');
- $body = pht(
+ $body = array();
+ $body[] = pht(
'Watching a project will let you monitor it closely. You will '.
'receive email and notifications about changes to every object '.
- 'associated with projects you watch.');
+ 'tagged with projects you watch.');
+ $body[] = pht(
+ 'Watching a project also watches all subprojects and milestones of '.
+ 'that project.');
$submit = pht('Watch Project');
break;
case 'unwatch':
@@ -78,12 +99,17 @@
return new Aphront404Response();
}
- return $this->newDialog()
+ $dialog = $this->newDialog()
->setTitle($title)
->addHiddenInput('via', $via)
- ->appendParagraph($body)
->addCancelButton($done_uri)
->addSubmitButton($submit);
+
+ foreach ((array)$body as $paragraph) {
+ $dialog->appendParagraph($paragraph);
+ }
+
+ return $dialog;
}
}
diff --git a/src/applications/project/query/PhabricatorProjectQuery.php b/src/applications/project/query/PhabricatorProjectQuery.php
--- a/src/applications/project/query/PhabricatorProjectQuery.php
+++ b/src/applications/project/query/PhabricatorProjectQuery.php
@@ -247,7 +247,7 @@
$all_graph = $this->getAllReachableAncestors($projects);
- if ($this->needAncestorMembers) {
+ if ($this->needAncestorMembers || $this->needWatchers) {
$src_projects = $all_graph;
} else {
$src_projects = $projects;
@@ -255,11 +255,13 @@
$all_sources = array();
foreach ($src_projects as $project) {
+ // For milestones, we need parent members.
if ($project->isMilestone()) {
- $phid = $project->getParentProjectPHID();
- } else {
- $phid = $project->getPHID();
+ $parent_phid = $project->getParentProjectPHID();
+ $all_sources[$parent_phid] = $parent_phid;
}
+
+ $phid = $project->getPHID();
$all_sources[$phid] = $phid;
}
@@ -318,7 +320,7 @@
if ($this->needWatchers) {
$watcher_phids = $edge_query->getDestinationPHIDs(
- $source_phids,
+ array($project_phid),
array($watcher_type));
$project->attachWatcherPHIDs($watcher_phids);
$project->setIsUserWatcher(
diff --git a/src/applications/project/storage/PhabricatorProject.php b/src/applications/project/storage/PhabricatorProject.php
--- a/src/applications/project/storage/PhabricatorProject.php
+++ b/src/applications/project/storage/PhabricatorProject.php
@@ -287,6 +287,32 @@
return $this->assertAttachedKey($this->sparseWatchers, $user_phid);
}
+ public function isUserAncestorWatcher($user_phid) {
+ $is_watcher = $this->isUserWatcher($user_phid);
+
+ if (!$is_watcher) {
+ $parent = $this->getParentProject();
+ if ($parent) {
+ return $parent->isUserWatcher($user_phid);
+ }
+ }
+
+ return $is_watcher;
+ }
+
+ public function getWatchedAncestorPHID($user_phid) {
+ if ($this->isUserWatcher($user_phid)) {
+ return $this->getPHID();
+ }
+
+ $parent = $this->getParentProject();
+ if ($parent) {
+ return $parent->getWatchedAncestorPHID($user_phid);
+ }
+
+ return null;
+ }
+
public function setIsUserWatcher($user_phid, $is_watcher) {
if ($this->sparseWatchers === self::ATTACHABLE) {
$this->sparseWatchers = array();
@@ -304,6 +330,21 @@
return $this->assertAttached($this->watcherPHIDs);
}
+ public function getAllAncestorWatcherPHIDs() {
+ $parent = $this->getParentProject();
+ if ($parent) {
+ $watchers = $parent->getAllAncestorWatcherPHIDs();
+ } else {
+ $watchers = array();
+ }
+
+ foreach ($this->getWatcherPHIDs() as $phid) {
+ $watchers[$phid] = $phid;
+ }
+
+ return $watchers;
+ }
+
public function attachSlugs(array $slugs) {
$this->slugs = $slugs;
return $this;
diff --git a/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php b/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php
--- a/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php
+++ b/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php
@@ -28,24 +28,10 @@
->withPHIDs(array($phid))
->executeOne();
- if (phid_get_type($phid) == PhabricatorProjectProjectPHIDType::TYPECONST) {
- // TODO: This is a big hack, but a weak argument for adding some kind
- // of "load for role" feature to ObjectQuery, and also not a really great
- // argument for adding some kind of "load extra stuff" feature to
- // SubscriberInterface. Do this for now and wait for the best way forward
- // to become more clear?
-
- $object = id(new PhabricatorProjectQuery())
- ->setViewer($viewer)
- ->withPHIDs(array($phid))
- ->needWatchers(true)
- ->executeOne();
- } else {
- $object = id(new PhabricatorObjectQuery())
- ->setViewer($viewer)
- ->withPHIDs(array($phid))
- ->executeOne();
- }
+ $object = id(new PhabricatorObjectQuery())
+ ->setViewer($viewer)
+ ->withPHIDs(array($phid))
+ ->executeOne();
if (!($object instanceof PhabricatorSubscribableInterface)) {
return $this->buildErrorResponse(
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -2607,14 +2607,19 @@
PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
if ($project_phids) {
- $watcher_type = PhabricatorObjectHasWatcherEdgeType::EDGECONST;
-
- $query = id(new PhabricatorEdgeQuery())
- ->withSourcePHIDs($project_phids)
- ->withEdgeTypes(array($watcher_type));
- $query->execute();
+ $projects = id(new PhabricatorProjectQuery())
+ ->setViewer(PhabricatorUser::getOmnipotentUser())
+ ->withPHIDs($project_phids)
+ ->needWatchers(true)
+ ->execute();
+
+ $watcher_phids = array();
+ foreach ($projects as $project) {
+ foreach ($project->getAllAncestorWatcherPHIDs() as $phid) {
+ $watcher_phids[$phid] = $phid;
+ }
+ }
- $watcher_phids = $query->getDestinationPHIDs();
if ($watcher_phids) {
// We need to do a visibility check for all the watchers, as
// watching a project is not a guarantee that you can see objects
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Mar 17, 6:09 PM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7659619
Default Alt Text
D15280.id36868.diff (9 KB)
Attached To
Mode
D15280: Make subproject/milestone watch rules work better
Attached
Detach File
Event Timeline
Log In to Comment