Page MenuHomePhabricator
Files F15432389

D14912.id36037.diff
No OneTemporary
Actions

D14912.id36037.diff
View Options

diff --git a/src/applications/project/engine/PhabricatorProjectEditEngine.php b/src/applications/project/engine/PhabricatorProjectEditEngine.php
--- a/src/applications/project/engine/PhabricatorProjectEditEngine.php
+++ b/src/applications/project/engine/PhabricatorProjectEditEngine.php
@@ -109,6 +109,8 @@
PhabricatorTransactions::TYPE_VIEW_POLICY,
PhabricatorTransactions::TYPE_EDIT_POLICY,
PhabricatorTransactions::TYPE_JOIN_POLICY,
+ PhabricatorProjectTransaction::TYPE_ICON,
+ PhabricatorProjectTransaction::TYPE_COLOR,
);
$unavailable = array_fuse($unavailable);
diff --git a/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php b/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
--- a/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
+++ b/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
@@ -42,11 +42,17 @@
$slug = $project->getPrimarySlug();
$handle->setName($name);
- $handle->setObjectName('#'.$slug);
- $handle->setURI("/tag/{$slug}/");
+
+ if (strlen($slug)) {
+ $handle->setObjectName('#'.$slug);
+ $handle->setURI("/tag/{$slug}/");
+ } else {
+ $handle->setURI("/project/view/{$id}/");
+ }
+
$handle->setImageURI($project->getProfileImageURI());
- $handle->setIcon($project->getIcon());
- $handle->setTagColor($project->getColor());
+ $handle->setIcon($project->getDisplayIcon());
+ $handle->setTagColor($project->getDisplayColor());
if ($project->isArchived()) {
$handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
diff --git a/src/applications/project/query/PhabricatorProjectSearchEngine.php b/src/applications/project/query/PhabricatorProjectSearchEngine.php
--- a/src/applications/project/query/PhabricatorProjectSearchEngine.php
+++ b/src/applications/project/query/PhabricatorProjectSearchEngine.php
@@ -13,7 +13,8 @@
public function newQuery() {
return id(new PhabricatorProjectQuery())
- ->needImages(true);
+ ->needImages(true)
+ ->withIsMilestone(false);
}
protected function buildCustomSearchFields() {
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
@@ -484,6 +484,22 @@
return $number;
}
+ public function getDisplayIcon() {
+ if ($this->isMilestone()) {
+ return 'fa-map-marker';
+ }
+
+ return $this->getIcon();
+ }
+
+ public function getDisplayColor() {
+ if ($this->isMilestone()) {
+ return self::DEFAULT_COLOR;
+ }
+
+ return $this->getColor();
+ }
+
/* -( PhabricatorSubscribableInterface )----------------------------------- */

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 25, 5:54 PM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7317781
Default Alt Text
D14912.id36037.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility