Commit ebf9c605 authored by dawehner's avatar dawehner Committed by tim.plunkett
Browse files

fix some wizard issues... again

parent be280193
...@@ -706,8 +706,9 @@ function views_ui_nojs_submit($form, &$form_state) { ...@@ -706,8 +706,9 @@ function views_ui_nojs_submit($form, &$form_state) {
function views_ui_wizard_form_validate($form, &$form_state) { function views_ui_wizard_form_validate($form, &$form_state) {
$wizard = views_ui_get_wizard($form_state['values']['show']['wizard_key']); $wizard = views_ui_get_wizard($form_state['values']['show']['wizard_key']);
$manager = views_get_plugin_manager('wizard'); $manager = views_get_plugin_manager('wizard');
$definition = $manager->getDefinition($wizard['plugin_id']);
$form_state['wizard'] = $wizard; $form_state['wizard'] = $wizard;
$form_state['wizard_instance'] = $manager->createInstance($wizard['plugin_id']); $form_state['wizard_instance'] = $manager->createInstance($wizard['plugin_id'], $definition);
$errors = $form_state['wizard_instance']->validate($form, $form_state); $errors = $form_state['wizard_instance']->validate($form, $form_state);
foreach ($errors as $name => $message) { foreach ($errors as $name => $message) {
form_set_error($name, $message); form_set_error($name, $message);
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
use Drupal\Component\Plugin\PluginManagerBase; use Drupal\Component\Plugin\PluginManagerBase;
use Drupal\Component\Plugin\Factory\DefaultFactory; use Drupal\Component\Plugin\Factory\DefaultFactory;
use Drupal\Views\Plugins\Discovery\ViewsDiscovery; use Drupal\views\Plugins\Discovery\ViewsDiscovery;
class WizardPluginManager extends PluginManagerBase { class WizardPluginManager extends PluginManagerBase {
public function __construct() { public function __construct() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment