Allow resetting the permalink by saving it as empty (#6615)

Fixes #6603.
WordPress · May 8, 2018 · 3d93ac6 · 3d93ac6
1 parent 4dc4c7b
commit 3d93ac6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/editor/components/post-permalink/editor.js b/editor/components/post-permalink/editor.js
@@ -29,7 +29,7 @@ class PostPermalinkEditor extends Component {
 
 		this.props.onSave();
 
-		if ( ! postName || postName === this.props.postName ) {
+		if ( postName === this.props.postName ) {
 			return;
 		}
 
@@ -63,7 +63,6 @@ class PostPermalinkEditor extends Component {
 						value={ editedPostName }
 						onChange={ ( event ) => this.setState( { editedPostName: event.target.value } ) }
 						type="text"
-						required
 						autoFocus
 					/>
 					<span className="editor-post-permalink-editor__suffix">

diff --git a/editor/store/selectors.js b/editor/store/selectors.js
@@ -1540,7 +1540,7 @@ export function getPermalink( state ) {
  */
 export function getPermalinkParts( state ) {
 	const permalinkTemplate = getEditedPostAttribute( state, 'permalink_template' );
-	const postName = getEditedPostAttribute( state, 'slug' ) || getEditedPostAttribute( state, 'draft_slug' );
+	const postName = getEditedPostAttribute( state, 'slug' ) || getEditedPostAttribute( state, 'generated_slug' );
 
 	const [ prefix, suffix ] = permalinkTemplate.split( PERMALINK_POSTNAME_REGEX );
 

diff --git a/lib/rest-api.php b/lib/rest-api.php
@@ -230,13 +230,10 @@ function gutenberg_add_permalink_template_to_posts( $response, $post, $request )
 		require_once ABSPATH . '/wp-admin/includes/post.php';
 	}
 
-	$sample_permalink = get_sample_permalink( $post->ID );
+	$sample_permalink = get_sample_permalink( $post->ID, $post->post_title, '' );
 
 	$response->data['permalink_template'] = $sample_permalink[0];
-
-	if ( 'draft' === $post->post_status && ! $post->post_name ) {
-		$response->data['draft_slug'] = $sample_permalink[1];
-	}
+	$response->data['generated_slug']     = $sample_permalink[1];
 
 	return $response;
 }