Page MenuHomePhabricator
Files F15412119

D11013.diff
No OneTemporary
Actions

D11013.diff
View Options

diff --git a/src/applications/maniphest/controller/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php
--- a/src/applications/maniphest/controller/ManiphestBatchEditController.php
+++ b/src/applications/maniphest/controller/ManiphestBatchEditController.php
@@ -171,8 +171,8 @@
'assign' => ManiphestTransaction::TYPE_OWNER,
'status' => ManiphestTransaction::TYPE_STATUS,
'priority' => ManiphestTransaction::TYPE_PRIORITY,
- 'add_project' => ManiphestTransaction::TYPE_PROJECTS,
- 'remove_project' => ManiphestTransaction::TYPE_PROJECTS,
+ 'add_project' => PhabricatorTransactions::TYPE_EDGE,
+ 'remove_project' => PhabricatorTransactions::TYPE_EDGE,
'add_ccs' => PhabricatorTransactions::TYPE_SUBSCRIBERS,
'remove_ccs' => PhabricatorTransactions::TYPE_SUBSCRIBERS,
);
@@ -214,7 +214,7 @@
case ManiphestTransaction::TYPE_PRIORITY:
$current = $task->getPriority();
break;
- case ManiphestTransaction::TYPE_PROJECTS:
+ case PhabricatorTransactions::TYPE_EDGE:
$current = $task->getProjectPHIDs();
break;
case PhabricatorTransactions::TYPE_SUBSCRIBERS:
@@ -243,7 +243,7 @@
$value = null;
}
break;
- case ManiphestTransaction::TYPE_PROJECTS:
+ case PhabricatorTransactions::TYPE_EDGE:
if (empty($value)) {
continue 2;
}
@@ -275,7 +275,7 @@
$value = $current."\n\n".$value;
}
break;
- case ManiphestTransaction::TYPE_PROJECTS:
+ case PhabricatorTransactions::TYPE_EDGE:
$is_remove = $action['action'] == 'remove_project';
$current = array_fill_keys($current, true);
@@ -356,12 +356,9 @@
id(new ManiphestTransactionComment())
->setContent($value));
break;
- case ManiphestTransaction::TYPE_PROJECTS:
-
- // TODO: Clean this mess up.
+ case PhabricatorTransactions::TYPE_EDGE:
$project_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
$xaction
- ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
->setMetadataValue('edge:type', $project_type)
->setNewValue(
array(
diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -139,7 +139,7 @@
ManiphestTransaction::TYPE_OWNER => pht('Reassign / Claim'),
PhabricatorTransactions::TYPE_SUBSCRIBERS => pht('Add CCs'),
ManiphestTransaction::TYPE_PRIORITY => pht('Change Priority'),
- ManiphestTransaction::TYPE_PROJECTS => pht('Associate Projects'),
+ PhabricatorTransactions::TYPE_EDGE => pht('Associate Projects'),
);
// Remove actions the user doesn't have permission to take.
@@ -149,7 +149,7 @@
ManiphestEditAssignCapability::CAPABILITY,
ManiphestTransaction::TYPE_PRIORITY =>
ManiphestEditPriorityCapability::CAPABILITY,
- ManiphestTransaction::TYPE_PROJECTS =>
+ PhabricatorTransactions::TYPE_EDGE =>
ManiphestEditProjectsCapability::CAPABILITY,
ManiphestTransaction::TYPE_STATUS =>
ManiphestEditStatusCapability::CAPABILITY,
@@ -264,7 +264,7 @@
ManiphestTransaction::TYPE_OWNER => 'assign_to',
PhabricatorTransactions::TYPE_SUBSCRIBERS => 'ccs',
ManiphestTransaction::TYPE_PRIORITY => 'priority',
- ManiphestTransaction::TYPE_PROJECTS => 'projects',
+ PhabricatorTransactions::TYPE_EDGE => 'projects',
);
$projects_source = new PhabricatorProjectDatasource();
@@ -272,7 +272,7 @@
$mailable_source = new PhabricatorMetaMTAMailableDatasource();
$tokenizer_map = array(
- ManiphestTransaction::TYPE_PROJECTS => array(
+ PhabricatorTransactions::TYPE_EDGE => array(
'id' => 'projects-tokenizer',
'src' => $projects_source->getDatasourceURI(),
'placeholder' => $projects_source->getPlaceholderText(),
diff --git a/src/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php
--- a/src/applications/maniphest/controller/ManiphestTaskEditController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php
@@ -234,7 +234,7 @@
if ($can_edit_projects) {
$projects = $request->getArr('projects');
- $changes[ManiphestTransaction::TYPE_PROJECTS] =
+ $changes[PhabricatorTransactions::TYPE_EDGE] =
$projects;
$column_phid = $request->getStr('columnPHID');
// allow for putting a task in a project column at creation -only-
@@ -276,12 +276,10 @@
if ($type == ManiphestTransaction::TYPE_PROJECT_COLUMN) {
$transaction->setNewValue($value['new']);
$transaction->setOldValue($value['old']);
- } else if ($type == ManiphestTransaction::TYPE_PROJECTS) {
- // TODO: Gross.
+ } else if ($type == PhabricatorTransactions::TYPE_EDGE) {
$project_type =
PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
$transaction
- ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
->setMetadataValue('edge:type', $project_type)
->setNewValue(
array(
diff --git a/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php b/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
--- a/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
+++ b/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
@@ -72,7 +72,7 @@
$transaction->setOldValue(array());
$transaction->setNewValue($phids);
break;
- case ManiphestTransaction::TYPE_PROJECTS:
+ case PhabricatorTransactions::TYPE_EDGE:
if ($value) {
$value = json_decode($value);
}
diff --git a/src/applications/maniphest/controller/ManiphestTransactionSaveController.php b/src/applications/maniphest/controller/ManiphestTransactionSaveController.php
--- a/src/applications/maniphest/controller/ManiphestTransactionSaveController.php
+++ b/src/applications/maniphest/controller/ManiphestTransactionSaveController.php
@@ -50,16 +50,14 @@
$assign_to = reset($assign_to);
$transaction->setNewValue($assign_to);
break;
- case ManiphestTransaction::TYPE_PROJECTS:
+ case PhabricatorTransactions::TYPE_EDGE:
$projects = $request->getArr('projects');
$projects = array_merge($projects, $task->getProjectPHIDs());
$projects = array_filter($projects);
$projects = array_unique($projects);
- // TODO: Bleh.
$project_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
$transaction
- ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
->setMetadataValue('edge:type', $project_type)
->setNewValue(
array(
diff --git a/src/applications/project/edge/PhabricatorProjectObjectHasProjectEdgeType.php b/src/applications/project/edge/PhabricatorProjectObjectHasProjectEdgeType.php
--- a/src/applications/project/edge/PhabricatorProjectObjectHasProjectEdgeType.php
+++ b/src/applications/project/edge/PhabricatorProjectObjectHasProjectEdgeType.php
@@ -9,6 +9,12 @@
return PhabricatorProjectProjectHasObjectEdgeType::EDGECONST;
}
+ public function getTransactionPreviewString($actor) {
+ return pht(
+ '%s edited associated projects.',
+ $actor);
+ }
+
public function getTransactionAddString(
$actor,
$add_count,
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -667,8 +667,7 @@
new PhutilNumber(count($rem)),
$this->renderHandleList($rem));
} else {
- return pht(
- '%s edited edge metadata.',
+ return $type_obj->getTransactionPreviewString(
$this->renderHandleLink($author_phid));
}
diff --git a/src/infrastructure/edges/type/PhabricatorEdgeType.php b/src/infrastructure/edges/type/PhabricatorEdgeType.php
--- a/src/infrastructure/edges/type/PhabricatorEdgeType.php
+++ b/src/infrastructure/edges/type/PhabricatorEdgeType.php
@@ -46,6 +46,12 @@
return false;
}
+ public function getTransactionPreviewString($actor) {
+ return pht(
+ '%s edited edge metadata.',
+ $actor);
+ }
+
public function getTransactionAddString(
$actor,
$add_count,

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 20, 11:21 AM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7706702
Default Alt Text
D11013.diff (9 KB)

Event Timeline

Phabricator · Built by Phacility