Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

fixed onSuccess on bulk actions and locale formatted numbers in success messages

Browse Source
This commit is contained in:
Jonathan Labreuille
2016-07-05 13:58:12 +02:00
parent f8efb3934b
commit d152b073a6
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/js/src/listing/bulk_actions.jsx
View File

@@ -47,13 +47,13 @@ function(
data.action = this.state.action; data.action = this.state.action;
var callback = function() {}; var onSuccess = function() {};
if(action['onSuccess'] !== undefined) { if(action['onSuccess'] !== undefined) {
callback = action.onSuccess; onSuccess = action.onSuccess;
} }
if(data.action) { if(data.action) {
this.props.onBulkAction(selected_ids, data, callback); this.props.onBulkAction(selected_ids, data).then(onSuccess);
} }
this.setState({ this.setState({

4
assets/js/src/listing/listing.jsx
View File

@@ -546,9 +546,9 @@ const Listing = React.createClass({
endpoint: this.props.endpoint, endpoint: this.props.endpoint,
action: 'bulkAction', action: 'bulkAction',
data: data data: data
}).done(function() { }).done(() => {
this.getItems(); this.getItems();
}.bind(this)); });
}, },
handleSearch: function(search) { handleSearch: function(search) {
this.setState({ this.setState({

14
assets/js/src/subscribers/list.jsx
View File

@@ -47,7 +47,7 @@ const messages = {
} else if (~~response > 1) { } else if (~~response > 1) {
message = ( message = (
MailPoet.I18n.t('multipleSubscribersTrashed') MailPoet.I18n.t('multipleSubscribersTrashed')
).replace('%$1d', ~~response); ).replace('%$1d', (~~response).toLocaleString());
} }
if (message !== null) { if (message !== null) {
@@ -83,7 +83,7 @@ const messages = {
} else if (~~response > 1) { } else if (~~response > 1) {
message = ( message = (
MailPoet.I18n.t('multipleSubscribersRestored') MailPoet.I18n.t('multipleSubscribersRestored')
).replace('%$1d', ~~response); ).replace('%$1d', (~~response).toLocaleString());
} }
if (message !== null) { if (message !== null) {
@@ -120,7 +120,7 @@ const bulk_actions = [
onSuccess: function(response) { onSuccess: function(response) {
MailPoet.Notice.success( MailPoet.Notice.success(
MailPoet.I18n.t('multipleSubscribersMovedToList') MailPoet.I18n.t('multipleSubscribersMovedToList')
.replace('%$1d', ~~(response.subscribers)) .replace('%$1d', (~~(response.subscribers)).toLocaleString())
.replace('%$2s', response.segment) .replace('%$2s', response.segment)
); );
} }
@@ -151,7 +151,7 @@ const bulk_actions = [
onSuccess: function(response) { onSuccess: function(response) {
MailPoet.Notice.success( MailPoet.Notice.success(
MailPoet.I18n.t('multipleSubscribersAddedToList') MailPoet.I18n.t('multipleSubscribersAddedToList')
.replace('%$1d', ~~response.subscribers) .replace('%$1d', (~~response.subscribers).toLocaleString())
.replace('%$2s', response.segment) .replace('%$2s', response.segment)
); );
} }
@@ -182,7 +182,7 @@ const bulk_actions = [
onSuccess: function(response) { onSuccess: function(response) {
MailPoet.Notice.success( MailPoet.Notice.success(
MailPoet.I18n.t('multipleSubscribersRemovedFromList') MailPoet.I18n.t('multipleSubscribersRemovedFromList')
.replace('%$1d', ~~response.subscribers) .replace('%$1d', (~~response.subscribers).toLocaleString())
.replace('%$2s', response.segment) .replace('%$2s', response.segment)
); );
} }
@@ -193,7 +193,7 @@ const bulk_actions = [
onSuccess: function(response) { onSuccess: function(response) {
MailPoet.Notice.success( MailPoet.Notice.success(
MailPoet.I18n.t('multipleSubscribersRemovedFromAllLists') MailPoet.I18n.t('multipleSubscribersRemovedFromAllLists')
.replace('%$1d', ~~response) .replace('%$1d', (~~response).toLocaleString())
); );
} }
}, },
@@ -203,7 +203,7 @@ const bulk_actions = [
onSuccess: function(response) { onSuccess: function(response) {
MailPoet.Notice.success( MailPoet.Notice.success(
MailPoet.I18n.t('multipleConfirmationEmailsSent') MailPoet.I18n.t('multipleConfirmationEmailsSent')
.replace('%$1d', ~~response) .replace('%$1d', (~~response).toLocaleString())
); );
} }
}, },