Page MenuHomePhabricator
Files F15391742

D14713.id35584.diff
No OneTemporary
Actions

D14713.id35584.diff
View Options

diff --git a/src/applications/phame/application/PhabricatorPhameApplication.php b/src/applications/phame/application/PhabricatorPhameApplication.php
--- a/src/applications/phame/application/PhabricatorPhameApplication.php
+++ b/src/applications/phame/application/PhabricatorPhameApplication.php
@@ -47,6 +47,7 @@
'edit/(?:(?P<id>[^/]+)/)?' => 'PhamePostEditController',
'history/(?P<id>\d+)/' => 'PhamePostHistoryController',
'view/(?P<id>\d+)/' => 'PhamePostViewController',
+ 'view/(?P<id>\d+)/(?P<slug>[^/]+)/' => 'PhamePostViewController',
'publish/(?P<id>\d+)/' => 'PhamePostPublishController',
'preview/(?P<id>\d+)/' => 'PhamePostPreviewController',
'unpublish/(?P<id>\d+)/' => 'PhamePostUnpublishController',
diff --git a/src/applications/phame/controller/blog/PhameBlogFeedController.php b/src/applications/phame/controller/blog/PhameBlogFeedController.php
--- a/src/applications/phame/controller/blog/PhameBlogFeedController.php
+++ b/src/applications/phame/controller/blog/PhameBlogFeedController.php
@@ -62,7 +62,7 @@
foreach ($posts as $post) {
$content[] = hsprintf('<entry>');
$content[] = phutil_tag('title', array(), $post->getTitle());
- $content[] = phutil_tag('link', array('href' => $post->getViewURI()));
+ $content[] = phutil_tag('link', array('href' => $post->getLiveURI()));
$content[] = phutil_tag('id', array(), PhabricatorEnv::getProductionURI(
'/phame/post/view/'.$post->getID().'/'));
diff --git a/src/applications/phame/controller/post/PhamePostEditController.php b/src/applications/phame/controller/post/PhamePostEditController.php
--- a/src/applications/phame/controller/post/PhamePostEditController.php
+++ b/src/applications/phame/controller/post/PhamePostEditController.php
@@ -6,6 +6,10 @@
$viewer = $request->getViewer();
$id = $request->getURIData('id');
+ $crumbs = $this->buildApplicationCrumbs();
+ $crumbs->addTextCrumb(
+ pht('Blogs'),
+ $this->getApplicationURI('blog/'));
if ($id) {
$post = id(new PhamePostQuery())
->setViewer($viewer)
@@ -29,6 +33,9 @@
$v_projects = array_reverse($v_projects);
$v_cc = PhabricatorSubscribersQuery::loadSubscribersForPHID(
$post->getPHID());
+ $blog = $post->getBlog();
+
+
} else {
$blog = id(new PhameBlogQuery())
->setViewer($viewer)
@@ -102,7 +109,7 @@
try {
$editor->applyTransactions($post, $xactions);
- $uri = $this->getApplicationURI('/post/view/'.$post->getID().'/');
+ $uri = $post->getViewURI();
return id(new AphrontRedirectResponse())->setURI($uri);
} catch (PhabricatorApplicationTransactionValidationException $ex) {
$validation_exception = $ex;
@@ -192,10 +199,12 @@
->setValidationException($validation_exception)
->setForm($form);
- $crumbs = $this->buildApplicationCrumbs();
+ $crumbs->addTextCrumb(
+ $blog->getName(),
+ $blog->getViewURI());
$crumbs->addTextCrumb(
$page_title,
- $this->getApplicationURI('/post/view/'.$id.'/'));
+ $cancel_uri);
return $this->newPage()
->setTitle($page_title)
diff --git a/src/applications/phame/controller/post/PhamePostNotLiveController.php b/src/applications/phame/controller/post/PhamePostNotLiveController.php
--- a/src/applications/phame/controller/post/PhamePostNotLiveController.php
+++ b/src/applications/phame/controller/post/PhamePostNotLiveController.php
@@ -15,17 +15,10 @@
}
$reasons = array();
- if (!$post->getBlog()) {
- $reasons[] = phutil_tag('p', array(), pht(
- 'You can not view the live version of this post because it '.
- 'is not associated with a blog. Move the post to a blog in order to '.
- 'view it live.'));
- }
-
if ($post->isDraft()) {
$reasons[] = phutil_tag('p', array(), pht(
'You can not view the live version of this post because it '.
- 'is still a draft. Use "Preview/Publish" to publish the post.'));
+ 'is still a draft. Use "Preview" or "Publish" to publish the post.'));
}
if ($reasons) {
@@ -45,7 +38,7 @@
// No reason this can't go live, maybe an old link. Kick them live and see
// what happens.
- $live_uri = $post->getViewURI();
+ $live_uri = $post->getLiveURI();
return id(new AphrontRedirectResponse())->setURI($live_uri);
}
diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php
--- a/src/applications/phame/controller/post/PhamePostViewController.php
+++ b/src/applications/phame/controller/post/PhamePostViewController.php
@@ -25,15 +25,9 @@
$crumbs->addTextCrumb(
pht('Blogs'),
$this->getApplicationURI('blog/'));
- if ($blog) {
- $crumbs->addTextCrumb(
- $blog->getName(),
- $this->getApplicationURI('blog/view/'.$blog->getID().'/'));
- } else {
- $crumbs->addTextCrumb(
- pht('[No Blog]'),
- null);
- }
+ $crumbs->addTextCrumb(
+ $blog->getName(),
+ $this->getApplicationURI('blog/view/'.$blog->getID().'/'));
$crumbs->addTextCrumb(
$post->getTitle(),
$this->getApplicationURI('post/view/'.$post->getID().'/'));
diff --git a/src/applications/phame/query/PhamePostSearchEngine.php b/src/applications/phame/query/PhamePostSearchEngine.php
--- a/src/applications/phame/query/PhamePostSearchEngine.php
+++ b/src/applications/phame/query/PhamePostSearchEngine.php
@@ -93,7 +93,7 @@
->setObject($post)
->setHeader($post->getTitle())
->setStatusIcon('fa-star')
- ->setHref($this->getApplicationURI("/post/view/{$id}/"))
+ ->setHref($post->getViewURI())
->addAttribute($blog_name);
if ($post->isDraft()) {
$item->setStatusIcon('fa-star-o grey');
diff --git a/src/applications/phame/storage/PhamePost.php b/src/applications/phame/storage/PhamePost.php
--- a/src/applications/phame/storage/PhamePost.php
+++ b/src/applications/phame/storage/PhamePost.php
@@ -48,7 +48,7 @@
return $this->blog;
}
- public function getViewURI() {
+ public function getLiveURI() {
// go for the pretty uri if we can
$domain = ($this->blog ? $this->blog->getDomain() : '');
if ($domain) {
@@ -59,6 +59,11 @@
return PhabricatorEnv::getProductionURI($uri);
}
+ public function getViewURI() {
+ $phame_title = PhabricatorSlug::normalize($this->getPhameTitle());
+ return '/phame/post/view/'.$this->getID().'/'.$phame_title;
+ }
+
public function getEditURI() {
return '/phame/post/edit/'.$this->getID().'/';
}
diff --git a/src/applications/phame/view/PhamePostListView.php b/src/applications/phame/view/PhamePostListView.php
--- a/src/applications/phame/view/PhamePostListView.php
+++ b/src/applications/phame/view/PhamePostListView.php
@@ -89,7 +89,7 @@
$item = id(new PHUIDocumentSummaryView())
->setTitle($post->getTitle())
- ->setHref('/phame/post/view/'.$post->getID().'/')
+ ->setHref($post->getViewURI())
->setSubtitle($subtitle)
->setImage($blogger_image)
->setImageHref($blogger_uri)

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 16, 11:25 AM (2 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7223546
Default Alt Text
D14713.id35584.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility