Commit 90408aa9 authored by tlyngej's avatar tlyngej

minor fixes to get the config form to work

parent c564f491
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
namespace Drupal\config_ignore\Form; namespace Drupal\config_ignore\Form;
use Drupal\config_ignore\ConfigImporterIgnore;
use Drupal\Core\Form\ConfigFormBase; use Drupal\Core\Form\ConfigFormBase;
use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Form\FormStateInterface;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
...@@ -40,7 +39,7 @@ class Settings extends ConfigFormBase { ...@@ -40,7 +39,7 @@ class Settings extends ConfigFormBase {
'#type' => 'textarea', '#type' => 'textarea',
'#rows' => 25, '#rows' => 25,
'#title' => $this->t('Configuration entity names to ignore'), '#title' => $this->t('Configuration entity names to ignore'),
'#description' => $this->t('One configuration name per line.<br />Examples: <ul><li>user.settings</li><li>views.settings</li><li>contact.settings</li><li>webform.webform.* (will ignore all config entities that starts with <em>webform.webform</em>)</li><li>* (will ignore everything)</li><li>@force_importwebform.webform.contact (will force import for this configuration, even if ignored by a wildcard)</li></ul>', ['@force_import' => ConfigImporterIgnore::FORCE_EXCLUSION_PREFIX]), '#description' => $this->t('One configuration name per line.<br />Examples: <ul><li>user.settings</li><li>views.settings</li><li>contact.settings</li><li>webform.webform.* (will ignore all config entities that starts with <em>webform.webform</em>)</li><li>* (will ignore everything)</li><li>~webform.webform.contact (will force import for this configuration, even if ignored by a wildcard)</li></ul>'),
'#default_value' => implode(PHP_EOL, $config_ignore_settings->get('ignored_config_entities')), '#default_value' => implode(PHP_EOL, $config_ignore_settings->get('ignored_config_entities')),
'#size' => 60, '#size' => 60,
]; ];
......
...@@ -42,7 +42,7 @@ class IgnoreFilter extends ConfigFilterBase implements ContainerFactoryPluginInt ...@@ -42,7 +42,7 @@ class IgnoreFilter extends ConfigFilterBase implements ContainerFactoryPluginInt
* @param \Drupal\Core\Config\StorageInterface $active * @param \Drupal\Core\Config\StorageInterface $active
* The active configuration store with the configuration on the site. * The active configuration store with the configuration on the site.
*/ */
public function __construct(array $configuration, $plugin_id, $plugin_definition, StorageInterface $active) { public function __construct(array $configuration, $plugin_id, array $plugin_definition, StorageInterface $active) {
parent::__construct($configuration, $plugin_id, $plugin_definition); parent::__construct($configuration, $plugin_id, $plugin_definition);
$this->active = $active; $this->active = $active;
} }
......
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