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

Change server returned newsletter body to be a json object, not a string

Browse Source
This commit is contained in:
Tautvidas Sipavičius
2015-12-11 17:14:23 +02:00
parent 3d82230d10
commit be3462925d
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
assets/js/src/newsletter_editor/components/content.js
View File

@@ -44,10 +44,10 @@ define([
}; };
Module.getBody = function() { Module.getBody = function() {
return JSON.stringify({ return {
content: App._contentContainer.toJSON(), content: App._contentContainer.toJSON(),
globalStyles: App.getGlobalStyles().toJSON(), globalStyles: App.getGlobalStyles().toJSON(),
}); };
}; };
Module.toJSON = function() { Module.toJSON = function() {
@@ -73,8 +73,7 @@ define([
}); });
App.on('start', function(options) { App.on('start', function(options) {
// TODO: Other newsletter information will be needed as well. var body = options.newsletter.body;
var body = JSON.parse(options.newsletter.body);
App._contentContainer = new (App.getBlockTypeModel('container'))(body.content, {parse: true}); App._contentContainer = new (App.getBlockTypeModel('container'))(body.content, {parse: true});
App._contentContainerView = new (App.getBlockTypeView('container'))({ App._contentContainerView = new (App.getBlockTypeView('container'))({
model: App._contentContainer, model: App._contentContainer,

2
assets/js/src/newsletter_editor/components/styles.js
View File

@@ -72,7 +72,7 @@ define([
App.getAvailableStyles = Module.getAvailableStyles; App.getAvailableStyles = Module.getAvailableStyles;
var body = JSON.parse(options.newsletter.body); var body = options.newsletter.body;
this.setGlobalStyles(body.globalStyles); this.setGlobalStyles(body.globalStyles);
}); });

9
lib/Router/NewsletterTemplates.php
View File

@@ -15,16 +15,25 @@ class NewsletterTemplates {
if($template === false) { if($template === false) {
wp_send_json(false); wp_send_json(false);
} else { } else {
$template->body = json_decode($template->body);
wp_send_json($template->asArray()); wp_send_json($template->asArray());
} }
} }
function getAll() { function getAll() {
$collection = NewsletterTemplate::findArray(); $collection = NewsletterTemplate::findArray();
$collection = array_map(function($item) {
$item['body'] = json_decode($item['body']);
return $item;
}, $collection);
wp_send_json($collection); wp_send_json($collection);
} }
function save($data = array()) { function save($data = array()) {
if (isset($data['body'])) {
$data['body'] = json_encode($data['body']);
}
$result = NewsletterTemplate::createOrUpdate($data); $result = NewsletterTemplate::createOrUpdate($data);
if($result !== true) { if($result !== true) {
wp_send_json($result); wp_send_json($result);

10
lib/Router/Newsletters.php
View File

@@ -33,6 +33,7 @@ class Newsletters {
return $segment['id']; return $segment['id'];
}, $segments); }, $segments);
$newsletter['options'] = $options; $newsletter['options'] = $options;
$newsletter['body'] = json_decode($newsletter['body']);
wp_send_json($newsletter); wp_send_json($newsletter);
} }
@@ -40,6 +41,10 @@ class Newsletters {
function getAll() { function getAll() {
$collection = Newsletter::findArray(); $collection = Newsletter::findArray();
$collection = array_map(function($item) {
$item['body'] = json_decode($item['body']);
return $item;
}, $collection);
wp_send_json($collection); wp_send_json($collection);
} }
@@ -54,6 +59,10 @@ class Newsletters {
unset($data['options']); unset($data['options']);
} }
if (isset($data['body'])) {
$data['body'] = json_encode($data['body']);
}
$errors = array(); $errors = array();
$result = false; $result = false;
@@ -282,6 +291,7 @@ class Newsletters {
} }
} }
} }
$newsletter->body = json_decode($newsletter->body);
wp_send_json($newsletter->asArray()); wp_send_json($newsletter->asArray());
} }
} }