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

Merge pull request #1249 from mailpoet/stats-segmentation

Browse Source 
Stats segmentation [PREMIUM-42]
This commit is contained in:
mrcasual
2018-02-01 20:34:39 -05:00
committed by GitHub
parent c8a20ec4ae 17a25120d4
commit 9159e8d21d
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -804,6 +804,10 @@ const Listing = React.createClass({
if (this.props.messages !== undefined) { if (this.props.messages !== undefined) {
messages = this.props.messages; messages = this.props.messages;
} }
let extraActions;
if (typeof this.props.renderExtraActions === 'function') {
extraActions = this.props.renderExtraActions(this.state);
}
return ( return (
<div> <div>
@ -824,6 +828,7 @@ const Listing = React.createClass({
onSelectFilter={this.handleFilter} onSelectFilter={this.handleFilter}
onEmptyTrash={this.handleEmptyTrash} onEmptyTrash={this.handleEmptyTrash}
/> />
{extraActions}
<ListingPages <ListingPages
count={this.state.count} count={this.state.count}
page={this.state.page} page={this.state.page}

1
lib/API/JSON/Response.php
View File

@ -9,6 +9,7 @@ abstract class Response {
const STATUS_UNAUTHORIZED = 401; const STATUS_UNAUTHORIZED = 401;
const STATUS_FORBIDDEN = 403; const STATUS_FORBIDDEN = 403;
const STATUS_NOT_FOUND = 404; const STATUS_NOT_FOUND = 404;
const STATUS_CONFLICT = 409;
const STATUS_UNKNOWN = 500; const STATUS_UNKNOWN = 500;
public $status; public $status;