Listing setParam only needs to be run when url history is specified
- added missing code to deleteManySubscriptions() so that it doesn't remove from all segments
This commit is contained in:
@ -365,6 +365,7 @@ const Listing = React.createClass({
|
||||
}.bind(this));
|
||||
},
|
||||
setParams: function() {
|
||||
if (this.props.location) {
|
||||
let params = Object.keys(this.state)
|
||||
.filter(key => {
|
||||
return (
|
||||
@ -393,14 +394,13 @@ const Listing = React.createClass({
|
||||
.filter(key => { return (key !== undefined) })
|
||||
.join('/');
|
||||
|
||||
// prepend with tab is specified
|
||||
// prepend url with "tab" if specified
|
||||
if (this.props.tab !== undefined) {
|
||||
params = `/${ this.props.tab }/${ params }`;
|
||||
} else {
|
||||
params = `/${ params }`;
|
||||
}
|
||||
|
||||
if (this.props.location) {
|
||||
if (this.props.location.pathname !== params) {
|
||||
this.context.router.push(`${params}`);
|
||||
}
|
||||
|
@ -129,6 +129,11 @@ class SubscriberSegment extends Model {
|
||||
'segment_id', $wp_segment->id
|
||||
);
|
||||
}
|
||||
|
||||
if(!empty($segment_ids)) {
|
||||
$subscriptions = $subscriptions->whereIn('segment_id', $segment_ids);
|
||||
}
|
||||
|
||||
return $subscriptions->deleteMany();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user