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

Merge pull request #208 from mailpoet/listing_tests

Browse Source 
Listings
This commit is contained in:
Marco
2015-11-10 10:39:53 +01:00
parent 64c35b12c8 893231e8e5
commit 6342cb17bd
16 changed files with 176 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,17 @@ function(
this.loadCachedItems();
this.setupSelect2();
},
componentDidUpdate: function() {
componentDidUpdate: function(prevProps, prevState) {
if(
(this.props.item !== undefined && prevProps.item !== undefined)
&& (this.props.item.id !== prevProps.item.id)
) {
jQuery('#'+this.refs.select.id).select2(
'val',
this.props.item[this.props.field.name]
);
}
this.setupSelect2();
},
setupSelect2: function() {
@ -54,6 +64,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,37 +91,33 @@ function(
return true;
},
render: function() {
if(this.state.items.length === 0) {
return false;
} else {
var options = this.state.items.map(function(item, index) {
return (
<option
key={ item.id }
value={ item.id }
>
{ item.name }
</option>
);
});
var default_value = (
(this.props.item !== undefined && this.props.field.name !== undefined)
? this.props.item[this.props.field.name]
: null
);
var options = this.state.items.map(function(item, index) {
return (
<select
id={ this.props.field.id || this.props.field.name }
ref="select"
placeholder={ this.props.field.placeholder }
multiple={ this.props.field.multiple }
onChange={ this.handleChange }
defaultValue={ default_value }
>{ options }</select>
<option
key={ item.id }
value={ item.id }
>
{ item.name }
</option>
);
}
});
var default_value = (
(this.props.item !== undefined && this.props.field.name !== undefined)
? this.props.item[this.props.field.name]
: null
);
return (
<select
id={ this.props.field.id || this.props.field.name }
ref="select"
placeholder={ this.props.field.placeholder }
multiple={ this.props.field.multiple }
onChange={ this.handleChange }
defaultValue={ default_value }
>{ options }</select>
);
}
});

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

@ -156,7 +156,7 @@ class Menu {
$data = array(
'settings' => $settings,
'segments' => Segment::findArray(),
'segments' => Segment::getPublished()->findArray(),
'pages' => Pages::getAll(),
'flags' => $flags,
'charsets' => Charsets::getAll(),
@ -230,7 +230,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()

29
lib/Form/Widget.php
View File

@ -72,7 +72,7 @@ class Widget extends \WP_Widget {
$selected_form = isset($instance['form']) ? (int)($instance['form']) : 0;
// get forms list
$forms = Form::whereNull('deleted_at')->orderByAsc('name')->findArray();
$forms = Form::getPublished()->orderByAsc('name')->findArray();
?><p>
<label for="<?php $this->get_field_id( 'title' ) ?>"><?php _e( 'Title:' ); ?></label>
<input
@ -94,23 +94,20 @@ class Widget extends \WP_Widget {
</select>
</p>
<p>
<a href="javascript:;" class="mailpoet_form_new"><?php _e("Create a new form"); ?></a>
<a href="javascript:;" onClick="createSubscriptionForm()" class="mailpoet_form_new"><?php _e("Create a new form"); ?></a>
</p>
<script type="text/javascript">
jQuery(function($) {
$(function() {
$('.mailpoet_form_new').on('click', function() {
MailPoet.Ajax.post({
endpoint: 'forms',
action: 'create'
}).done(function(response) {
if(response !== false) {
window.location = response;
}
});
function createSubscriptionForm() {
MailPoet.Ajax.post({
endpoint: 'forms',
action: 'create'
}).done(function(response) {
if(response !== false) {
window.location = response;
}
});
});
});
return false;
}
</script>
<?php
}
@ -134,7 +131,7 @@ class Widget extends \WP_Widget {
);
// get form
$form = Form::whereNull('deleted_at')->findOne($instance['form']);
$form = Form::getPublished()->findOne($instance['form']);
// if the form was not found, return nothing.
if($form === false) {

4
lib/Models/Form.php
View File

@ -54,12 +54,12 @@ class Form extends Model {
array(
'name' => 'all',
'label' => __('All'),
'count' => Form::whereNull('deleted_at')->count()
'count' => Form::getPublished()->count()
),
array(
'name' => 'trash',
'label' => __('Trash'),
'count' => Form::whereNotNull('deleted_at')->count()
'count' => Form::getTrashed()->count()
)
);
}

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');
}
}

4
lib/Models/Newsletter.php
View File

@ -106,12 +106,12 @@ class Newsletter extends Model {
array(
'name' => 'all',
'label' => __('All'),
'count' => Newsletter::whereNull('deleted_at')->count()
'count' => Newsletter::getPublished()->count()
),
array(
'name' => 'trash',
'label' => __('Trash'),
'count' => Newsletter::whereNotNull('deleted_at')->count()
'count' => Newsletter::getTrashed()->count()
)
);
}

6
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() {
@ -76,12 +76,12 @@ class Segment extends Model {
array(
'name' => 'all',
'label' => __('All'),
'count' => Segment::whereNull('deleted_at')->count()
'count' => Segment::getPublished()->count()
),
array(
'name' => 'trash',
'label' => __('Trash'),
'count' => Segment::whereNotNull('deleted_at')->count()
'count' => Segment::getTrashed()->count()
)
);
}

4
lib/Models/Subscriber.php
View File

@ -90,7 +90,7 @@ class Subscriber extends Model {
array(
'name' => 'all',
'label' => __('All'),
'count' => Subscriber::whereNull('deleted_at')->count()
'count' => Subscriber::getPublished()->count()
),
array(
'name' => 'subscribed',
@ -110,7 +110,7 @@ class Subscriber extends Model {
array(
'name' => 'trash',
'label' => __('Trash'),
'count' => Subscriber::whereNotNull('deleted_at')->count()
'count' => Subscriber::getTrashed()->count()
)
);
}

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()) {