Page MenuHomePhabricator
Files F13227230

D9829.id23589.diff
No OneTemporary
Actions

D9829.id23589.diff
View Options

diff --git a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
--- a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
+++ b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
@@ -106,24 +106,25 @@
PhabricatorLiskDAO $object,
PhabricatorApplicationTransaction $xaction) {
+ $old = $xaction->getOldValue();
+ $new = $xaction->getNewValue();
+
switch ($xaction->getTransactionType()) {
case PhabricatorProjectTransaction::TYPE_NAME:
+ // First, remove the old and new slugs. Removing the old slug is
+ // important when changing the project's capitalization or puctuation.
+ // Removing the new slug is important when changing the project's name
+ // so that one of its secondary slugs is now the primary slug.
+ if ($old !== null) {
+ $this->removeSlug($object, $old);
+ }
+ $this->removeSlug($object, $new);
+
$new_slug = id(new PhabricatorProjectSlug())
->setSlug($object->getPrimarySlug())
->setProjectPHID($object->getPHID())
->save();
- if ($xaction->getOldValue() !== null) {
- $clone_object = clone $object;
- $clone_object->setPhrictionSlug($xaction->getOldValue());
- $old_slug = $clone_object->getPrimarySlug();
- $old_slug = id(new PhabricatorProjectSlug())
- ->loadOneWhere('slug = %s', $old_slug);
- if ($old_slug) {
- $old_slug->delete();
- }
- }
-
// TODO -- delete all of the below once we sever automagical project
// to phriction stuff
if ($xaction->getOldValue() === null) {
@@ -429,4 +430,28 @@
return parent::extractFilePHIDsFromCustomTransaction($object, $xaction);
}
+ private function removeSlug(
+ PhabricatorLiskDAO $object,
+ $name) {
+
+ $object = (clone $object);
+ $object->setPhrictionSlug($name);
+ $slug = $object->getPrimarySlug();
+
+ $slug_object = id(new PhabricatorProjectSlug())->loadOneWhere(
+ 'slug = %s',
+ $slug);
+
+ if (!$slug_object) {
+ return;
+ }
+
+ if ($slug_object->getProjectPHID() != $object->getPHID()) {
+ throw new Exception(
+ pht('Trying to remove slug owned by another project!'));
+ }
+
+ $slug_object->delete();
+ }
+
}

File Metadata

Mime Type
text/plain
Expires
Tue, May 21, 1:54 AM (3 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6290211
Default Alt Text
D9829.id23589.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility