From cb055a2b06e5a7e6e0bf755607748741c3ea6900 Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel@mailpoet.com>
Date: Mon, 29 Jan 2018 15:37:52 +0000
Subject: [PATCH 1/2] Allow extra action buttons in filter rows

[PREMIUM-42]
---
 assets/js/src/listing/listing.jsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/assets/js/src/listing/listing.jsx b/assets/js/src/listing/listing.jsx
index 7a212b0d00..a80034ad96 100644
--- a/assets/js/src/listing/listing.jsx
+++ b/assets/js/src/listing/listing.jsx
@@ -804,6 +804,10 @@ const Listing = React.createClass({
     if (this.props.messages !== undefined) {
       messages = this.props.messages;
     }
+    let extraActions;
+    if (typeof this.props.renderExtraActions === 'function') {
+      extraActions = this.props.renderExtraActions(this.state);
+    }
 
     return (
       <div>
@@ -824,6 +828,7 @@ const Listing = React.createClass({
             onSelectFilter={this.handleFilter}
             onEmptyTrash={this.handleEmptyTrash}
           />
+          {extraActions}
           <ListingPages
             count={this.state.count}
             page={this.state.page}

From 17a25120d4d4e3a7eb97e8c262c676632ed4ced8 Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel@mailpoet.com>
Date: Tue, 30 Jan 2018 10:16:12 +0000
Subject: [PATCH 2/2] Add conflict HTTP code

[PREMIUM-42]
---
 lib/API/JSON/Response.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/API/JSON/Response.php b/lib/API/JSON/Response.php
index 34dd6016db..bcfd54a8ad 100644
--- a/lib/API/JSON/Response.php
+++ b/lib/API/JSON/Response.php
@@ -9,6 +9,7 @@ abstract class Response {
   const STATUS_UNAUTHORIZED = 401;
   const STATUS_FORBIDDEN = 403;
   const STATUS_NOT_FOUND = 404;
+  const STATUS_CONFLICT = 409;
   const STATUS_UNKNOWN = 500;
 
   public $status;