Page MenuHomePhabricator
Files F15453774

D11697.diff
No OneTemporary
Actions

D11697.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
@@ -82,6 +82,7 @@
switch ($xaction->getTransactionType()) {
case PhabricatorProjectTransaction::TYPE_NAME:
$object->setName($xaction->getNewValue());
+ // TODO - this is really "setPrimarySlug"
$object->setPhrictionSlug($xaction->getNewValue());
return;
case PhabricatorProjectTransaction::TYPE_SLUGS:
@@ -127,19 +128,12 @@
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 punctuation.
- // Removing the new slug is important when changing the project's name
- // so that one of its secondary slugs is now the primary slug.
+ // First, add the old name as a secondary slug; this is helpful
+ // for renames and generally a good thing to do.
if ($old !== null) {
- $this->removeSlug($object, $old);
+ $this->addSlug($object, $old);
}
- $this->removeSlug($object, $new);
-
- $new_slug = id(new PhabricatorProjectSlug())
- ->setSlug($object->getPrimarySlug())
- ->setProjectPHID($object->getPHID())
- ->save();
+ $this->addSlug($object, $new);
return;
case PhabricatorProjectTransaction::TYPE_SLUGS:
@@ -429,7 +423,7 @@
return parent::extractFilePHIDsFromCustomTransaction($object, $xaction);
}
- private function removeSlug(
+ private function addSlug(
PhabricatorLiskDAO $object,
$name) {
@@ -441,16 +435,13 @@
'slug = %s',
$slug);
- if (!$slug_object) {
+ 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();
+ $new_slug = id(new PhabricatorProjectSlug())
+ ->setSlug($slug)
+ ->setProjectPHID($object->getPHID())
+ ->save();
}
-
}
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
@@ -278,15 +278,10 @@
}
if ($this->slugs !== null) {
- $slugs = array();
- foreach ($this->slugs as $slug) {
- $slugs[] = rtrim(PhabricatorSlug::normalize($slug), '/');
- }
-
$where[] = qsprintf(
$conn_r,
'slug.slug IN (%Ls)',
- $slugs);
+ $this->slugs);
}
if ($this->phrictionSlugs !== null) {

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 30, 2:17 PM (4 w, 9 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7666235
Default Alt Text
D11697.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility