From fae4f5e98a4310f37a4b0dc2c57882445931e9e8 Mon Sep 17 00:00:00 2001
From: dereine <dereine@99340.no-reply.drupal.org>
Date: Tue, 28 Aug 2012 12:45:27 +0200
Subject: [PATCH] Issue #1760188 by dawehner: Improve Wizard method
default_display_options().
---
.../views/Plugin/views/wizard/WizardPluginBase.php | 10 +++++++---
lib/Views/comment/Plugin/views/wizard/Comment.php | 7 +++++--
lib/Views/file/Plugin/views/wizard/File.php | 7 +++++--
lib/Views/node/Plugin/views/wizard/Node.php | 6 +++---
lib/Views/node/Plugin/views/wizard/NodeRevision.php | 7 +++++--
.../taxonomy/Plugin/views/wizard/TaxonomyTerm.php | 7 +++++--
lib/Views/user/Plugin/views/wizard/Users.php | 7 +++++--
7 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index c15ec4ff051d..2dab7da0f1ea 100644
--- a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -636,7 +636,7 @@ protected function instantiate_view($form, &$form_state) {
*/
protected function build_display_options($form, $form_state) {
// Display: Master
- $display_options['default'] = $this->default_display_options($form, $form_state);
+ $display_options['default'] = $this->default_display_options();
$display_options['default'] += array(
'filters' => array(),
'sorts' => array(),
@@ -715,10 +715,14 @@ protected function add_displays($view, $display_options, $form, $form_state) {
/**
* Assembles the default display options for the view.
*
- * Most subclasses will need to override this method to provide some fields
+ * Most wizards will need to override this method to provide some fields
* or a different row plugin.
+ *
+ * @return array
+ * Returns an array of display options, which are used in
+ * ViewDisplay::$display_options.
*/
- protected function default_display_options($form, $form_state) {
+ protected function default_display_options() {
$display_options = array();
$display_options['access']['type'] = 'none';
$display_options['cache']['type'] = 'none';
diff --git a/lib/Views/comment/Plugin/views/wizard/Comment.php b/lib/Views/comment/Plugin/views/wizard/Comment.php
index 20b45e2b8f9f..4311ddab907e 100644
--- a/lib/Views/comment/Plugin/views/wizard/Comment.php
+++ b/lib/Views/comment/Plugin/views/wizard/Comment.php
@@ -124,8 +124,11 @@ protected function display_options_row(&$display_options, $row_plugin, $row_opt
}
}
- protected function default_display_options($form, $form_state) {
- $display_options = parent::default_display_options($form, $form_state);
+ /**
+ * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::default_display_options().
+ */
+ protected function default_display_options() {
+ $display_options = parent::default_display_options();
// Add permission-based access control.
$display_options['access']['type'] = 'perm';
diff --git a/lib/Views/file/Plugin/views/wizard/File.php b/lib/Views/file/Plugin/views/wizard/File.php
index 71db6f8d92e9..0408617610e3 100644
--- a/lib/Views/file/Plugin/views/wizard/File.php
+++ b/lib/Views/file/Plugin/views/wizard/File.php
@@ -39,8 +39,11 @@ class File extends WizardPluginBase {
'file_download_path' => TRUE
);
- protected function default_display_options($form, $form_state) {
- $display_options = parent::default_display_options($form, $form_state);
+ /**
+ * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::default_display_options().
+ */
+ protected function default_display_options() {
+ $display_options = parent::default_display_options();
// Add permission-based access control.
$display_options['access']['type'] = 'perm';
diff --git a/lib/Views/node/Plugin/views/wizard/Node.php b/lib/Views/node/Plugin/views/wizard/Node.php
index 27a6fd256e6c..fe2d5143b4d7 100644
--- a/lib/Views/node/Plugin/views/wizard/Node.php
+++ b/lib/Views/node/Plugin/views/wizard/Node.php
@@ -119,10 +119,10 @@ protected function build_form_style(&$form, &$form_state, $type) {
}
/**
- * @override
+ * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::default_display_options().
*/
- protected function default_display_options($form, $form_state) {
- $display_options = parent::default_display_options($form, $form_state);
+ protected function default_display_options() {
+ $display_options = parent::default_display_options();
// Add permission-based access control.
$display_options['access']['type'] = 'perm';
diff --git a/lib/Views/node/Plugin/views/wizard/NodeRevision.php b/lib/Views/node/Plugin/views/wizard/NodeRevision.php
index b56303291835..4eaa055ead15 100644
--- a/lib/Views/node/Plugin/views/wizard/NodeRevision.php
+++ b/lib/Views/node/Plugin/views/wizard/NodeRevision.php
@@ -80,8 +80,11 @@ protected function row_style_options($type) {
return $options;
}
- protected function default_display_options($form, $form_state) {
- $display_options = parent::default_display_options($form, $form_state);
+ /**
+ * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::default_display_options().
+ */
+ protected function default_display_options() {
+ $display_options = parent::default_display_options();
// Add permission-based access control.
$display_options['access']['type'] = 'perm';
diff --git a/lib/Views/taxonomy/Plugin/views/wizard/TaxonomyTerm.php b/lib/Views/taxonomy/Plugin/views/wizard/TaxonomyTerm.php
index 632957f18eed..465ba46a7eb1 100644
--- a/lib/Views/taxonomy/Plugin/views/wizard/TaxonomyTerm.php
+++ b/lib/Views/taxonomy/Plugin/views/wizard/TaxonomyTerm.php
@@ -37,8 +37,11 @@ class TaxonomyTerm extends WizardPluginBase {
)
);
- protected function default_display_options($form, $form_state) {
- $display_options = parent::default_display_options($form, $form_state);
+ /**
+ * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::default_display_options().
+ */
+ protected function default_display_options() {
+ $display_options = parent::default_display_options();
// Add permission-based access control.
$display_options['access']['type'] = 'perm';
diff --git a/lib/Views/user/Plugin/views/wizard/Users.php b/lib/Views/user/Plugin/views/wizard/Users.php
index 808479caf6f7..2597f5bf0e5b 100644
--- a/lib/Views/user/Plugin/views/wizard/Users.php
+++ b/lib/Views/user/Plugin/views/wizard/Users.php
@@ -58,8 +58,11 @@ class Users extends WizardPluginBase {
)
);
- protected function default_display_options($form, $form_state) {
- $display_options = parent::default_display_options($form, $form_state);
+ /**
+ * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::default_display_options().
+ */
+ protected function default_display_options() {
+ $display_options = parent::default_display_options();
// Add permission-based access control.
$display_options['access']['type'] = 'perm';
--
GitLab