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

Listings

Browse Source 
- fixed selection field JSX
- fixed bulk actions (added filter function)
- added getPublished/getTrashed static methods on Model
- fixed step 3 of newsletter process
- updated save/get methods of all listing-able models to conform with the new norm
This commit is contained in:
Jonathan Labreuille
2015-11-09 13:26:33 +01:00
parent 0199e2c7e1
commit e9110680ee
12 changed files with 120 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
assets/js/src/form/fields/selection.jsx
View File

@ -54,6 +54,11 @@ function(
loadCachedItems: function() {
if(typeof(window['mailpoet_'+this.props.field.endpoint]) !== 'undefined') {
var items = window['mailpoet_'+this.props.field.endpoint];
if(this.props.field['filter'] !== undefined) {
items = items.filter(this.props.field.filter);
}
this.setState({
items: items
});
@ -76,7 +81,7 @@ function(
return true;
},
render: function() {
if(this.state.items.length === 0) {
if((this.props.item !== undefined && this.props.item.id === undefined)) {
return false;
} else {
var options = this.state.items.map(function(item, index) {

26
assets/js/src/form/form.jsx
View File

@ -88,7 +88,7 @@ define(
}).done(function(response) {
this.setState({ loading: false });
if(response === true) {
if(response.result === true) {
if(this.props.onSuccess !== undefined) {
this.props.onSuccess()
} else {
@ -101,10 +101,10 @@ define(
this.props.messages['created']();
}
} else {
if(response === false) {
// unknown error occurred
} else {
this.setState({ errors: response });
if(response.result === false) {
if(response.errors.length > 0) {
this.setState({ errors: response.errors });
}
}
}
}.bind(this));
@ -121,13 +121,15 @@ define(
return true;
},
render: function() {
var errors = this.state.errors.map(function(error, index) {
return (
<p key={ 'error-'+index } className="mailpoet_error">
{ error }
</p>
);
});
if(this.state.errors !== undefined) {
var errors = this.state.errors.map(function(error, index) {
return (
<p key={ 'error-'+index } className="mailpoet_error">
{ error }
</p>
);
});
}
var formClasses = classNames(
'mailpoet_form',

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

@ -15,16 +15,16 @@ function(
this.setState({
action: e.target.value,
extra: false
});
}, function() {
var action = this.getSelectedAction();
var action = this.getSelectedAction();
// action on select callback
if(action !== null && action['onSelect'] !== undefined) {
this.setState({
extra: action.onSelect(e)
});
}
// action on select callback
if(action !== null && action['onSelect'] !== undefined) {
this.setState({
extra: action.onSelect(e)
});
}
}.bind(this));
},
handleApplyAction: function(e) {
e.preventDefault();

5
assets/js/src/newsletters/send.jsx
View File

@ -34,7 +34,10 @@ define(
placeholder: "Select a list",
id: "mailpoet_segments",
endpoint: "segments",
multiple: true
multiple: true,
filter: function(segment) {
return !!(!segment.deleted_at);
}
},
{
name: 'sender',

11
assets/js/src/subscribers/form.jsx
View File

@ -37,6 +37,17 @@ define(
'subscribed': 'Subscribed',
'unsubscribed': 'Unsubscribed'
}
},
{
name: 'segments',
label: 'Lists',
type: 'selection',
placeholder: "Select a list",
endpoint: "segments",
multiple: true,
filter: function(segment) {
return !!(!segment.deleted_at);
}
}
];

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

@ -101,7 +101,10 @@ const bulk_actions = [
onSelect: function() {
let field = {
id: 'move_to_segment',
endpoint: 'segments'
endpoint: 'segments',
filter: function(segment) {
return !!(!segment.deleted_at);
}
};
return (
@ -127,7 +130,10 @@ const bulk_actions = [
onSelect: function() {
let field = {
id: 'add_to_segment',
endpoint: 'segments'
endpoint: 'segments',
filter: function(segment) {
return !!(!segment.deleted_at);
}
};
return (

4
lib/Config/Menu.php
View File

@ -146,7 +146,7 @@ class Menu {
$data = array(
'settings' => $settings,
'segments' => Segment::findArray(),
'segments' => Segment::getPublished()->findArray(),
'pages' => Pages::getAll(),
'flags' => $flags,
'charsets' => Charsets::getAll(),
@ -214,7 +214,7 @@ class Menu {
$data = array(
'form' => $form,
'pages' => Pages::getAll(),
'segments' => Segment::findArray(),
'segments' => Segment::getPublished()->findArray(),
'styles' => FormRenderer::getStyles($form),
'date_types' => Block\Date::getDateTypes(),
'date_formats' => Block\Date::getDateFormats()

8
lib/Models/Model.php
View File

@ -90,4 +90,12 @@ class Model extends \Sudzy\ValidModel {
}, $searchCriteria);
return $orm->having_raw(implode(' ' . $searchCondition . ' ', $havingFields), array_values($havingValues));
}
static function getPublished() {
return static::whereNull('deleted_at');
}
static function getTrashed() {
return static::whereNotNull('deleted_at');
}
}

2
lib/Models/Segment.php
View File

@ -68,7 +68,7 @@ class Segment extends Model {
}
static function search($orm, $search = '') {
return $orm->where_like('name', '%'.$search.'%');
return $orm->whereLike('name', '%'.$search.'%');
}
static function groups() {

16
lib/Router/Newsletters.php
View File

@ -33,7 +33,6 @@ class Newsletters {
}, $segments);
$newsletter['options'] = $options;
wp_send_json($newsletter);
}
}
@ -54,9 +53,16 @@ class Newsletters {
unset($data['options']);
}
$errors = array();
$result = false;
$newsletter = Newsletter::createOrUpdate($data);
if($newsletter->id) {
if($newsletter !== false && !$newsletter->id()) {
$errors = $newsletter->getValidationErrors();
} else {
$result = true;
if(!empty($segment_ids)) {
NewsletterSegment::where('newsletter_id', $newsletter->id)
->deleteMany();
@ -89,8 +95,10 @@ class Newsletters {
}
}
}
wp_send_json(($newsletter->id !== false));
wp_send_json(array(
'result' => $result,
'errors' => $errors
));
}
function delete($data = array()) {

15
lib/Router/Segments.php
View File

@ -71,13 +71,20 @@ class Segments {
}
function save($data = array()) {
$result = Segment::createOrUpdate($data);
$errors = array();
$result = false;
if($result !== true) {
wp_send_json($result);
$segment = Segment::createOrUpdate($data);
if($segment !== false && !$segment->id()) {
$errors = $segment->getValidationErrors();
} else {
wp_send_json(true);
$result = true;
}
wp_send_json(array(
'result' => $result,
'errors' => $errors
));
}
function restore($id) {

39
lib/Router/Subscribers.php
View File

@ -21,7 +21,14 @@ class Subscribers {
if($subscriber === false) {
wp_send_json(false);
} else {
wp_send_json($subscriber->asArray());
$segments = $subscriber->segments()->findArray();
$subscriber = $subscriber->asArray();
$subscriber['segments'] = array_map(function($segment) {
return $segment['id'];
}, $segments);
wp_send_json($subscriber);
}
}
@ -58,18 +65,40 @@ class Subscribers {
}
function save($data = array()) {
$errors = array();
$result = false;
$segments = false;
if(array_key_exists('segments', $data)) {
$segments = $data['segments'];
unset($data['segments']);
}
$subscriber = Subscriber::createOrUpdate($data);
if($subscriber !== false && !$subscriber->id()) {
$result = array(
'errors' => $subscriber->getValidationErrors()
);
$errors = $subscriber->getValidationErrors();
} else {
$result = true;
if($segments !== false) {
SubscriberSegment::where('subscriber_id', $subscriber->id)
->deleteMany();
if(!empty($segments)) {
foreach($segments as $segment_id) {
$relation = SubscriberSegment::create();
$relation->segment_id = $segment_id;
$relation->subscriber_id = $subscriber->id;
$relation->save();
}
}
}
}
wp_send_json($result);
wp_send_json(array(
'result' => $result,
'errors' => $errors
));
}
function subscribe($data = array()) {