Changeset 10088

Timestamp:

12/06/2008 11:10:24 AM (18 years ago)

Author:

markjaquith

Message:

Make Password protected and private mutually exclusive when using Quick Edit.

Location:

trunk

Files:

• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-page-form.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-admin/js/inline-edit-post.js (modified) (2 diffs)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/edit-form-advanced.php

@@ -147 +147 @@
 <?php _e('Visibility:'); ?> <b><span id="post-visibility-display"><?php
 
-if ( !empty( $post->post_password ) ) {
+if ( 'private' == $post->post_status ) {
+        $post->post_password = '';
+        $visibility = 'private';
+        $visibility_trans = __('Private');
+} elseif ( !empty( $post->post_password ) ) {
         $visibility = 'password';
         $visibility_trans = __('Password protected');
-} elseif ( 'private' == $post->post_status ) {
-        $visibility = 'private';
-        $visibility_trans = __('Private');
 } elseif ( is_sticky( $post->ID ) ) {
         $visibility = 'public';

trunk/wp-admin/edit-page-form.php

@@ -142 +142 @@
 <?php _e('Visibility:'); ?> <b><span id="post-visibility-display"><?php
 
-if ( !empty( $post->post_password ) ) {
+if ( 'private' == $post->post_status ) {
+        $post->post_password = '';
+        $visibility = 'private';
+        $visibility_trans = __('Private');
+} elseif ( !empty( $post->post_password ) ) {
         $visibility = 'password';
         $visibility_trans = __('Password protected');
-} elseif ( 'private' == $post->post_status ) {
-        $visibility = 'private';
-        $visibility_trans = __('Private');
 } else {
         $visibility = 'public';

trunk/wp-admin/includes/template.php

@@ -1012 +1012 @@
                         </label>
 
+                        <em style="margin:5px 10px 0 0" class="alignleft"><?php echo _c( '&ndash;OR&ndash;|Between password field and private checkbox on post quick edit interface' ); ?></em>
+
                         <label class="alignleft inline-edit-private">
-                                <input type="checkbox" name="keep_private" value="private" <?php checked($post->post_status, 'private'); ?> />
+                                <input type="checkbox" name="keep_private" value="private" />
                                 <span class="checkbox-title"><?php echo $is_page ? __('Private page') : __('Private post'); ?></span>
                         </label>
@@ -3249 +3251 @@
 
         if ( !empty($post->post_password) )
-                $post_states[] = __('Protected');
+                $post_states[] = __('Password protected');
         if ( 'private' == $post->post_status && 'private' != $post_status )
                 $post_states[] = __('Private');

trunk/wp-admin/js/inline-edit-post.js

@@ -21 +21 @@
 
                 $('a.cancel', bulkRow).click(function() { return inlineEditPost.revert(); });
+
+                $('#inline-edit .inline-edit-private input[value=private]').click( function(){
+                        var pw = $('input.inline-edit-password-input');
+                        if ( $(this).attr('checked') ) {
+                                pw.val('').attr('disabled', 'disabled');
+                        } else {
+                                pw.attr('disabled', '');
+                        }
+                });
 
                 // add events
@@ -147 +156 @@
                 var status = $('._status', rowData).text();
                 if ( status != 'future' ) $('select[name="_status"] option[value="future"]', editRow).remove();
-                if ( status == 'private' ) $('input[name="keep_private"]', editRow).attr("checked", "checked");
+                if ( status == 'private' ) {
+                        $('input[name="keep_private"]', editRow).attr("checked", "checked");
+                        $('input.inline-edit-password-input').val('').attr('disabled', 'disabled');
+                }
 
                 // remove the current page and children from the parent dropdown

trunk/wp-includes/post.php

@@ -1423 +1423 @@
                 $menu_order = 0;
 
-        if ( !isset($post_password) )
+        if ( !isset($post_password) || 'private' == $post_status )
                 $post_password = '';
 

trunk/wp-includes/script-loader.php

@@ -251 +251 @@
                 $scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' );
 
-                $scripts->add( 'inline-edit-post', '/wp-admin/js/inline-edit-post.js', array( 'jquery', 'jquery-form', 'suggest' ), '20081129' );
+                $scripts->add( 'inline-edit-post', '/wp-admin/js/inline-edit-post.js', array( 'jquery', 'jquery-form', 'suggest' ), '20081206' );
                 $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
                         'error' => __('Error while saving the changes.'),