Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow note action URLs to be empty.

This commit is contained in:
Jeff Stieler 2019-05-24 13:05:12 -04:00
parent 72206d296c
commit 0d9784700c
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/woocommerce-admin/client/header/activity-panel/panels/inbox.js
View File

@ -60,7 +60,7 @@ class InboxPanel extends Component {
return []; return [];
} }
return actions.map( action => ( return actions.map( action => (
<Button isDefault href={ action.url }> <Button isDefault href={ action.url || undefined }>
{ action.label } { action.label }
</Button> </Button>
) ); ) );

2
plugins/woocommerce-admin/client/layout/store-alerts/index.js
View File

@ -74,7 +74,7 @@ class StoreAlerts extends Component {
key={ action.name } key={ action.name }
isDefault isDefault
isPrimary={ action.primary } isPrimary={ action.primary }
href={ action.url } href={ action.url || undefined }
onClick={ '' === action.status ? noop : markStatus } onClick={ '' === action.status ? noop : markStatus }
> >
{ action.label } { action.label }

3
plugins/woocommerce-admin/includes/api/class-wc-admin-rest-admin-notes-controller.php
View File

@ -242,6 +242,9 @@ class WC_Admin_REST_Admin_Notes_Controller extends WC_REST_CRUD_Controller {
* @return string A fully formed URL. * @return string A fully formed URL.
*/ */
public function prepare_query_for_response( $query ) { public function prepare_query_for_response( $query ) {
if ( empty( $query ) ) {
return $query;
}
if ( 'https://' === substr( $query, 0, 8 ) ) { if ( 'https://' === substr( $query, 0, 8 ) ) {
return $query; return $query;
} }

17
plugins/woocommerce-admin/includes/notes/class-wc-admin-note.php
View File

@ -475,16 +475,16 @@ class WC_Admin_Note extends WC_Data {
/** /**
* Add an action to the note * Add an action to the note
* *
* @param string $name Label name (not presented to user). * @param string $name Action name (not presented to user).
* @param string $label Note label (e.g. presented as button label). * @param string $label Action label (presented as button label).
* @param string $query Note query (for redirect). * @param string $url Action URL, if navigation needed. Optional.
* @param string $status The status to set for the action should on click. * @param string $status Status to transition parent Note to upon click. Defaults to 'actioned'.
* @param boolean $primary Whether or not this is the primary action. Defaults to false. * @param boolean $primary Whether or not this is the primary action. Defaults to false.
*/ */
public function add_action( $name, $label, $query, $status = '', $primary = false ) { public function add_action( $name, $label, $url = '', $status = self::E_WC_ADMIN_NOTE_ACTIONED, $primary = false ) {
$name = wc_clean( $name ); $name = wc_clean( $name );
$label = wc_clean( $label ); $label = wc_clean( $label );
$query = wc_clean( $query ); $query = esc_url( $url );
$status = wc_clean( $status ); $status = wc_clean( $status );
$primary = (bool) $primary; $primary = (bool) $primary;
@ -496,11 +496,6 @@ class WC_Admin_Note extends WC_Data {
$this->error( 'admin_note_invalid_data', __( 'The admin note action label prop cannot be empty.', 'woocommerce-admin' ) ); $this->error( 'admin_note_invalid_data', __( 'The admin note action label prop cannot be empty.', 'woocommerce-admin' ) );
} }
// @todo - maybe allow empty queries? for dismissals that don't need navigation.
if ( empty( $query ) ) {
$this->error( 'admin_note_invalid_data', __( 'The admin note action query prop cannot be empty.', 'woocommerce-admin' ) );
}
$action = array( $action = array(
'name' => $name, 'name' => $name,
'label' => $label, 'label' => $label,