Changeset 42544 for branches/4.9

Timestamp:

01/22/2018 07:11:17 PM (9 years ago)

Author:

westonruter

Message:

Customize: Let default status for Customizer be draft if user does not have capability to publish.

Amends [41626].
Props sayedwp, westonruter.
See #30937.
Fixes #42686 for 4.9 branch.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/js/customize-controls.js (modified) (4 diffs)

branches/4.9/src/wp-admin/js/customize-controls.js

@@ -7932 +7932 @@
                                 editShortcutVisibility  = state.instance( 'editShortcutVisibility' ),
                                 changesetLocked = state.instance( 'changesetLocked' ),
-                                populateChangesetUuidParam;
+                                populateChangesetUuidParam, defaultSelectedChangesetStatus;
 
                         state.bind( 'change', function() {
@@ -7966 +7966 @@
                                                         saveBtn.val( api.l10n.schedule );
                                                 }
-                                        } else if ( ! api.settings.changeset.currentUserCanPublish ) {
-                                                selectedChangesetStatus( 'draft' );
-                                        } else {
+                                        } else if ( api.settings.changeset.currentUserCanPublish ) {
                                                 saveBtn.val( api.l10n.publish );
                                         }
@@ -7990 +7988 @@
                         };
 
+                        defaultSelectedChangesetStatus = api.settings.changeset.currentUserCanPublish ? 'publish' : 'draft';
+
                         // Set default states.
                         changesetStatus( api.settings.changeset.status );
@@ -7995 +7995 @@
                         changesetDate( api.settings.changeset.publishDate );
                         selectedChangesetDate( api.settings.changeset.publishDate );
-                        selectedChangesetStatus( '' === api.settings.changeset.status || 'auto-draft' === api.settings.changeset.status ? 'publish' : api.settings.changeset.status );
+                        selectedChangesetStatus( '' === api.settings.changeset.status || 'auto-draft' === api.settings.changeset.status ? defaultSelectedChangesetStatus : api.settings.changeset.status );
                         selectedChangesetStatus.link( changesetStatus ); // Ensure that direct updates to status on server via wp.customizer.previewer.save() will update selection.
                         saved( true );