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

fixed multiple select component

Browse Source
This commit is contained in:
Jonathan Labreuille
2015-10-09 14:48:54 +02:00
parent be2c35c13e
commit ed9407a890
7 changed files with 102 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
assets/css/src/common.styl
View File

@ -16,3 +16,11 @@ a:focus
// hide elements
.mailpoet_hidden
display: none
// select 2
.select2-container
width: 25em
@media screen and (max-width: 782px)
.select2-container
width: 100% !important

51
assets/js/src/form/fields/field.jsx
View File

@ -4,7 +4,8 @@ define([
'form/fields/textarea.jsx',
'form/fields/select.jsx',
'form/fields/radio.jsx',
'form/fields/checkbox.jsx'
'form/fields/checkbox.jsx',
'form/fields/selection.jsx'
],
function(
React,
@ -12,7 +13,8 @@ function(
FormFieldTextarea,
FormFieldSelect,
FormFieldRadio,
FormFieldCheckbox
FormFieldCheckbox,
FormFieldSelection
) {
var FormField = React.createClass({
renderField: function(data, inline = false) {
@ -26,29 +28,33 @@ function(
var field = false;
if(data.field['field'] !== undefined) {
field = data.field.field;
} else{
switch(data.field.type) {
case 'text':
field = (<FormFieldText {...data} />);
break;
data.field = jQuery.merge(data.field, data.field.field);
}
case 'textarea':
field = (<FormFieldTextarea {...data} />);
break;
switch(data.field.type) {
case 'text':
field = (<FormFieldText {...data} />);
break;
case 'select':
field = (<FormFieldSelect {...data} />);
break;
case 'textarea':
field = (<FormFieldTextarea {...data} />);
break;
case 'radio':
field = (<FormFieldRadio {...data} />);
break;
case 'select':
field = (<FormFieldSelect {...data} />);
break;
case 'checkbox':
field = (<FormFieldCheckbox {...data} />);
break;
}
case 'radio':
field = (<FormFieldRadio {...data} />);
break;
case 'checkbox':
field = (<FormFieldCheckbox {...data} />);
break;
case 'selection':
field = (<FormFieldSelection {...data} />);
break;
}
if(inline === true) {
@ -75,7 +81,8 @@ function(
return this.renderField({
index: index,
field: subfield,
item: this.props.item
item: this.props.item,
onValueChange: this.props.onValueChange || false
});
}.bind(this));
} else {

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

@ -1,6 +1,7 @@
define([
'react',
'jquery'
'jquery',
'select2'
],
function(
React,
@ -9,43 +10,45 @@ function(
var Selection = React.createClass({
getInitialState: function() {
return {
loading: false,
items: [],
selected: []
items: []
}
},
componentWillMount: function() {
this.loadCachedItems();
},
componentDidMount: function() {
if(this.props.select2) {
jQuery('#'+this.props.id).select2({
width: '25em'
});
}
jQuery('#'+this.props.field.id).select2()
.on('change', this.handleChange);
},
componentDidUpdate: function() {
jQuery('#'+this.props.field.id).select2(
'val',
(this.props.item[this.props.field.name])
);
},
loadCachedItems: function() {
if(typeof(window['mailpoet_'+this.props.endpoint]) !== 'undefined') {
var items = window['mailpoet_'+this.props.endpoint];
if(typeof(window['mailpoet_'+this.props.field.endpoint]) !== 'undefined') {
var items = window['mailpoet_'+this.props.field.endpoint];
this.setState({
items: items
});
}
},
handleChange: function() {
this.setState({
selected: jQuery('#'+this.props.id).val()
return this.props.onValueChange({
target: {
value: jQuery('#'+this.props.field.id).select2('val'),
name: this.props.field.name
}
});
},
getSelected: function() {
return this.state.selected;
},
render: function() {
var options = this.state.items.map(function(item, index) {
return (
<option
key={ 'action-' + index }
value={ item.id }>
key={ item.id }
value={ item.id }
>
{ item.name }
</option>
);
@ -54,12 +57,12 @@ function(
return (
<select
ref="selection"
id={ this.props.id || 'mailpoet_field_selection'}
placeholder={ this.props.placeholder }
multiple={ this.props.multiple }
>
{ options }
</select>
id={ this.props.field.id || 'mailpoet_field_selection'}
placeholder={ this.props.field.placeholder }
multiple={ this.props.field.multiple }
onChange={ this.handleChange }
defaultValue={ this.props.item[this.props.field.name] }
>{ options }</select>
);
}
});

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

@ -27,17 +27,14 @@ define(
type: 'text'
},
{
name: 'list',
name: 'segments',
label: 'Lists',
tip: "The subscriber list that will be used for this campaign.",
field: (
<Selection
placeholder="Select a list"
id="mailpoet_segments"
endpoint="segments"
multiple={ true }
select2={ true } />
)
type: 'selection',
placeholder: "Select a list",
id: "mailpoet_segments",
endpoint: "segments",
multiple: true
},
{
name: 'sender',

6
lib/Config/Migrator.php
View File

@ -116,7 +116,8 @@ class Migrator {
'segment_id mediumint(9) NOT NULL,',
'created_at TIMESTAMP NOT NULL DEFAULT 0,',
'updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,',
'PRIMARY KEY (id)'
'PRIMARY KEY (id)',
'UNIQUE KEY subscriber_segment (subscriber_id, segment_id)'
);
return $this->sqlify(__FUNCTION__, $attributes);
}
@ -128,7 +129,8 @@ class Migrator {
'segment_id mediumint(9) NOT NULL,',
'created_at TIMESTAMP NOT NULL DEFAULT 0,',
'updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,',
'PRIMARY KEY (id)'
'PRIMARY KEY (id)',
'UNIQUE KEY newsletter_segment (newsletter_id, segment_id)'
);
return $this->sqlify(__FUNCTION__, $attributes);
}

2
lib/Models/Newsletter.php
View File

@ -107,7 +107,7 @@ class Newsletter extends Model {
$saved = $newsletter->save();
if($saved === true) {
return true;
return $newsletter->id();
} else {
$errors = $newsletter->getValidationErrors();
if(!empty($errors)) {

32
lib/Router/Newsletters.php
View File

@ -7,6 +7,7 @@ use MailPoet\Models\Newsletter;
use MailPoet\Models\Segment;
use MailPoet\Models\Subscriber;
use MailPoet\Models\NewsletterTemplate;
use MailPoet\Models\NewsletterSegment;
use MailPoet\Newsletter\Renderer\Renderer;
if(!defined('ABSPATH')) exit;
@ -21,7 +22,12 @@ class Newsletters {
if($newsletter === false) {
wp_send_json(false);
} else {
wp_send_json($newsletter->asArray());
$segments = $newsletter->segments()->findArray();
$newsletter = $newsletter->asArray();
$newsletter['segments'] = array_map(function($segment) {
return $segment['id'];
}, $segments);
wp_send_json($newsletter);
}
}
@ -31,12 +37,26 @@ class Newsletters {
}
function save($data = array()) {
$result = Newsletter::createOrUpdate($data);
if($result !== true) {
wp_send_json($result);
} else {
wp_send_json(true);
if(isset($data['segments'])) {
$segment_ids = $data['segments'];
unset($data['segments']);
}
$newsletter_id = Newsletter::createOrUpdate($data);
if($newsletter_id !== false && !empty($segment_ids)) {
// remove previous relationships with segments
NewsletterSegment::where('newsletter_id', $newsletter_id)->deleteMany();
// create relationship with segments
foreach($segment_ids as $segment_id) {
$relation = NewsletterSegment::create();
$relation->segment_id = $segment_id;
$relation->newsletter_id = $newsletter_id;
$relation->save();
}
}
wp_send_json(($newsletter_id !== false));
}
function delete($id) {