- Updates Migrator with new column for Segments

- Updates Segmnets tests
- Updates MailPoet's Notice.js with additional options
- Updates Import's router, WP menu bootstrap logic, client- and
  server-side logic
This commit is contained in:
MrCasual
2015-11-01 20:00:23 -05:00
parent ff5353c894
commit ad0adb48e1
12 changed files with 1464 additions and 258 deletions

View File

@@ -1,6 +1,6 @@
<?php
namespace MailPoet\Config;
use MailPoet\Import\Import;
use \MailPoet\Import\BootstrapMenu;
use \MailPoet\Models\Segment;
use \MailPoet\Models\Setting;
use \MailPoet\Models\Form;
@@ -214,12 +214,13 @@ class Menu {
}
function import() {
$import = new Import();
$data = $import->bootstrapImportMenu();
$import = new BootstrapMenu();
$data = $import->bootstrap();
echo $this->renderer->render('import.html', $data);
}
function formEditor() {
$id = (isset($_GET['id']) ? (int)$_GET['id'] : 0);