Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13178411
D14792.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
14 KB
Referenced Files
None
Subscribers
None
D14792.diff
View Options
diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -410,7 +410,6 @@
'rsrc/js/application/owners/OwnersPathEditor.js' => 'aa1733d0',
'rsrc/js/application/owners/owners-path-editor.js' => '7a68dda3',
'rsrc/js/application/passphrase/passphrase-credential-control.js' => '3cb0b2fc',
- 'rsrc/js/application/phame/phame-post-preview.js' => 'd6bba572',
'rsrc/js/application/pholio/behavior-pholio-mock-edit.js' => '246dc085',
'rsrc/js/application/pholio/behavior-pholio-mock-view.js' => 'fbe497e7',
'rsrc/js/application/phortune/behavior-stripe-payment-form.js' => '3f5d6dbf',
@@ -648,7 +647,6 @@
'javelin-behavior-phabricator-transaction-comment-form' => 'b23b49e6',
'javelin-behavior-phabricator-transaction-list' => '13c739ea',
'javelin-behavior-phabricator-watch-anchor' => '9f36c42d',
- 'javelin-behavior-phame-post-preview' => 'd6bba572',
'javelin-behavior-pholio-mock-edit' => '246dc085',
'javelin-behavior-pholio-mock-view' => 'fbe497e7',
'javelin-behavior-phui-dropdown-menu' => '54733475',
@@ -1856,12 +1854,6 @@
'javelin-dom',
'javelin-stratcom',
),
- 'd6bba572' => array(
- 'javelin-behavior',
- 'javelin-dom',
- 'javelin-util',
- 'phabricator-shaped-request',
- ),
'd75709e6' => array(
'javelin-behavior',
'javelin-workflow',
diff --git a/resources/sql/autopatches/20151215.phame.1.autotitle.sql b/resources/sql/autopatches/20151215.phame.1.autotitle.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20151215.phame.1.autotitle.sql
@@ -0,0 +1,5 @@
+ALTER TABLE {$NAMESPACE}_phame.phame_post
+ DROP KEY phameTitle;
+
+ALTER TABLE {$NAMESPACE}_phame.phame_post
+ CHANGE phameTitle phameTitle VARCHAR(64) COLLATE {$COLLATE_SORT};
diff --git a/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php b/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php
--- a/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php
+++ b/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php
@@ -19,7 +19,6 @@
'blogPHID' => 'required phid',
'title' => 'required string',
'body' => 'required string',
- 'phameTitle' => 'optional string',
'bloggerPHID' => 'optional phid',
'isDraft' => 'optional bool',
);
@@ -89,12 +88,6 @@
$post->setVisibility(PhameConstants::VISIBILITY_PUBLISHED);
}
$post->setTitle($title);
- $phame_title = $request->getValue(
- 'phameTitle',
- id(new PhutilUTF8StringTruncator())
- ->setMaximumBytes(64)
- ->truncateString($title));
- $post->setPhameTitle(PhabricatorSlug::normalize($phame_title));
$post->setBody($body);
$post->save();
diff --git a/src/applications/phame/conduit/PhameQueryPostsConduitAPIMethod.php b/src/applications/phame/conduit/PhameQueryPostsConduitAPIMethod.php
--- a/src/applications/phame/conduit/PhameQueryPostsConduitAPIMethod.php
+++ b/src/applications/phame/conduit/PhameQueryPostsConduitAPIMethod.php
@@ -20,7 +20,6 @@
'phids' => 'optional list<phid>',
'blogPHIDs' => 'optional list<phid>',
'bloggerPHIDs' => 'optional list<phid>',
- 'phameTitles' => 'optional list<string>',
'published' => 'optional bool',
'publishedAfter' => 'optional date',
'before' => 'optional int',
@@ -58,11 +57,6 @@
$query->withBloggerPHIDs($blogger_phids);
}
- $phame_titles = $request->getValue('phameTitles', array());
- if ($phame_titles) {
- $query->withPhameTitles($phame_titles);
- }
-
$published = $request->getValue('published', null);
if ($published === true) {
$query->withVisibility(PhameConstants::VISIBILITY_PUBLISHED);
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
@@ -60,17 +60,13 @@
}
$title = $post->getTitle();
- $phame_title = $post->getPhameTitle();
$body = $post->getBody();
$visibility = $post->getVisibility();
$e_title = true;
- $e_phame_title = true;
$validation_exception = null;
if ($request->isFormPost()) {
$title = $request->getStr('title');
- $phame_title = $request->getStr('phame_title');
- $phame_title = PhabricatorSlug::normalize($phame_title);
$body = $request->getStr('body');
$v_projects = $request->getArr('projects');
$v_cc = $request->getArr('cc');
@@ -81,9 +77,6 @@
->setTransactionType(PhamePostTransaction::TYPE_TITLE)
->setNewValue($title),
id(new PhamePostTransaction())
- ->setTransactionType(PhamePostTransaction::TYPE_PHAME_TITLE)
- ->setNewValue($phame_title),
- id(new PhamePostTransaction())
->setTransactionType(PhamePostTransaction::TYPE_BODY)
->setNewValue($body),
id(new PhamePostTransaction())
@@ -115,8 +108,6 @@
$validation_exception = $ex;
$e_title = $validation_exception->getShortMessage(
PhamePostTransaction::TYPE_TITLE);
- $e_phame_title = $validation_exception->getShortMessage(
- PhamePostTransaction::TYPE_PHAME_TITLE);
}
}
@@ -140,15 +131,6 @@
->setID('post-title')
->setError($e_title))
->appendChild(
- id(new AphrontFormTextControl())
- ->setLabel(pht('Phame Title'))
- ->setName('phame_title')
- ->setValue(rtrim($phame_title, '/'))
- ->setID('post-phame-title')
- ->setCaption(pht('Up to 64 alphanumeric characters '.
- 'with underscores for spaces.'))
- ->setError($e_phame_title))
- ->appendChild(
id(new AphrontFormSelectControl())
->setLabel(pht('Visibility'))
->setName('visibility')
@@ -187,13 +169,6 @@
->setControlID('post-body')
->setPreviewType(PHUIRemarkupPreviewPanel::DOCUMENT);
- Javelin::initBehavior(
- 'phame-post-preview',
- array(
- 'title' => 'post-title',
- 'phame_title' => 'post-phame-title',
- ));
-
$form_box = id(new PHUIObjectBoxView())
->setHeaderText($page_title)
->setValidationException($validation_exception)
diff --git a/src/applications/phame/editor/PhamePostEditor.php b/src/applications/phame/editor/PhamePostEditor.php
--- a/src/applications/phame/editor/PhamePostEditor.php
+++ b/src/applications/phame/editor/PhamePostEditor.php
@@ -15,7 +15,6 @@
$types = parent::getTransactionTypes();
$types[] = PhamePostTransaction::TYPE_TITLE;
- $types[] = PhamePostTransaction::TYPE_PHAME_TITLE;
$types[] = PhamePostTransaction::TYPE_BODY;
$types[] = PhamePostTransaction::TYPE_VISIBILITY;
$types[] = PhabricatorTransactions::TYPE_COMMENT;
@@ -30,8 +29,6 @@
switch ($xaction->getTransactionType()) {
case PhamePostTransaction::TYPE_TITLE:
return $object->getTitle();
- case PhamePostTransaction::TYPE_PHAME_TITLE:
- return $object->getPhameTitle();
case PhamePostTransaction::TYPE_BODY:
return $object->getBody();
case PhamePostTransaction::TYPE_VISIBILITY:
@@ -45,7 +42,6 @@
switch ($xaction->getTransactionType()) {
case PhamePostTransaction::TYPE_TITLE:
- case PhamePostTransaction::TYPE_PHAME_TITLE:
case PhamePostTransaction::TYPE_BODY:
case PhamePostTransaction::TYPE_VISIBILITY:
return $xaction->getNewValue();
@@ -59,8 +55,6 @@
switch ($xaction->getTransactionType()) {
case PhamePostTransaction::TYPE_TITLE:
return $object->setTitle($xaction->getNewValue());
- case PhamePostTransaction::TYPE_PHAME_TITLE:
- return $object->setPhameTitle($xaction->getNewValue());
case PhamePostTransaction::TYPE_BODY:
return $object->setBody($xaction->getNewValue());
case PhamePostTransaction::TYPE_VISIBILITY:
@@ -81,7 +75,6 @@
switch ($xaction->getTransactionType()) {
case PhamePostTransaction::TYPE_TITLE:
- case PhamePostTransaction::TYPE_PHAME_TITLE:
case PhamePostTransaction::TYPE_BODY:
case PhamePostTransaction::TYPE_VISIBILITY:
return;
@@ -114,43 +107,6 @@
$errors[] = $error;
}
break;
- case PhamePostTransaction::TYPE_PHAME_TITLE:
- if (!$xactions) {
- continue;
- }
- $missing = $this->validateIsEmptyTextField(
- $object->getPhameTitle(),
- $xactions);
- $phame_title = last($xactions)->getNewValue();
-
- if ($missing || $phame_title == '/') {
- $error = new PhabricatorApplicationTransactionValidationError(
- $type,
- pht('Required'),
- pht('Phame title is required.'),
- nonempty(last($xactions), null));
-
- $error->setIsMissingFieldError(true);
- $errors[] = $error;
- }
-
- $duplicate_post = id(new PhamePostQuery())
- ->setViewer(PhabricatorUser::getOmnipotentUser())
- ->withPhameTitles(array($phame_title))
- ->executeOne();
- if ($duplicate_post && $duplicate_post->getID() != $object->getID()) {
- $error_text = pht(
- 'Phame title must be unique; another post already has this phame '.
- 'title.');
- $error = new PhabricatorApplicationTransactionValidationError(
- $type,
- pht('Not Unique'),
- $error_text,
- nonempty(last($xactions), null));
- $errors[] = $error;
- }
-
- break;
}
return $errors;
}
diff --git a/src/applications/phame/query/PhamePostQuery.php b/src/applications/phame/query/PhamePostQuery.php
--- a/src/applications/phame/query/PhamePostQuery.php
+++ b/src/applications/phame/query/PhamePostQuery.php
@@ -5,7 +5,6 @@
private $ids;
private $blogPHIDs;
private $bloggerPHIDs;
- private $phameTitles;
private $visibility;
private $publishedAfter;
private $phids;
@@ -30,11 +29,6 @@
return $this;
}
- public function withPhameTitles(array $phame_titles) {
- $this->phameTitles = $phame_titles;
- return $this;
- }
-
public function withVisibility($visibility) {
$this->visibility = $visibility;
return $this;
@@ -106,13 +100,6 @@
$this->bloggerPHIDs);
}
- if ($this->phameTitles) {
- $where[] = qsprintf(
- $conn,
- 'p.phameTitle IN (%Ls)',
- $this->phameTitles);
- }
-
if ($this->visibility !== null) {
$where[] = qsprintf(
$conn,
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
@@ -98,7 +98,7 @@
),
self::CONFIG_COLUMN_SCHEMA => array(
'title' => 'text255',
- 'phameTitle' => 'sort64',
+ 'phameTitle' => 'sort64?',
'visibility' => 'uint32',
'mailKey' => 'bytes20',
@@ -118,10 +118,6 @@
'columns' => array('phid'),
'unique' => true,
),
- 'phameTitle' => array(
- 'columns' => array('bloggerPHID', 'phameTitle'),
- 'unique' => true,
- ),
'bloggerPosts' => array(
'columns' => array(
'bloggerPHID',
@@ -147,7 +143,7 @@
}
public function getSlug() {
- return rtrim($this->getPhameTitle(), '/');
+ return PhabricatorSlug::normalizeProjectSlug($this->getTitle(), true);
}
public function toDictionary() {
@@ -158,7 +154,6 @@
'bloggerPHID' => $this->getBloggerPHID(),
'viewURI' => $this->getViewURI(),
'title' => $this->getTitle(),
- 'phameTitle' => $this->getPhameTitle(),
'body' => $this->getBody(),
'summary' => PhabricatorMarkupEngine::summarize($this->getBody()),
'datePublished' => $this->getDatePublished(),
diff --git a/webroot/rsrc/js/application/phame/phame-post-preview.js b/webroot/rsrc/js/application/phame/phame-post-preview.js
deleted file mode 100644
--- a/webroot/rsrc/js/application/phame/phame-post-preview.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * @provides javelin-behavior-phame-post-preview
- * @requires javelin-behavior
- * javelin-dom
- * javelin-util
- * phabricator-shaped-request
- */
-
-JX.behavior('phame-post-preview', function(config) {
-
- var title = JX.$(config.title);
- var phame_title = JX.$(config.phame_title);
- var sync_titles = true;
-
- var titleCallback = function() {
- if (!sync_titles) {
- return;
- }
- var title_string = title.value;
- phame_title.value = normalizeSlug(title_string);
- };
-
- var phameTitleKeyupCallback = function () {
- // stop sync'ing once user edits phame_title directly
- sync_titles = false;
- var normalized = normalizeSlug(phame_title.value, true);
- if (normalized == phame_title.value) {
- return;
- }
- var position = phame_title.value.length;
- if ('selectionStart' in phame_title) {
- position = phame_title.selectionStart;
- }
- phame_title.value = normalized;
- if ('setSelectionRange' in phame_title) {
- phame_title.focus();
- phame_title.setSelectionRange(position, position);
- }
- };
-
- var phameTitleBlurCallback = function () {
- phame_title.value = normalizeSlug(phame_title.value);
- };
-
- // This is a sort of implementation of PhabricatorSlug::normalize
- var normalizeSlug = function (slug, spare_trailing_underscore) {
- var s = slug.toLowerCase().replace(/[^a-z0-9/]+/g, '_').substr(0, 63);
- if (spare_trailing_underscore) {
- // do nothing
- } else {
- s = s.replace(/_$/g, '');
- }
- return s;
- };
-
- var getdata = function() {
- return {
- title : title.value,
- phame_title : phame_title.value
- };
- };
-
- JX.DOM.listen(title, 'keyup', null, titleCallback);
- JX.DOM.listen(phame_title, 'keyup', null, phameTitleKeyupCallback);
- JX.DOM.listen(phame_title, 'blur', null, phameTitleBlurCallback);
-
-});
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, May 9, 8:24 PM (1 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6276734
Default Alt Text
D14792.diff (14 KB)
Attached To
Mode
D14792: Always automatically generate Phame slugs
Attached
Detach File
Event Timeline
Log In to Comment