From 2842bc148a9b62e3942ebdf15f74d400b7323361 Mon Sep 17 00:00:00 2001
From: Daniel Wehner <daniel.wehner@erdfisch.de>
Date: Sun, 29 Jul 2012 17:28:44 -0500
Subject: [PATCH] some random bug fixes
---
.../views/Plugin/views/argument/ArgumentPluginBase.php | 3 +++
lib/Drupal/views/Plugin/views/argument/ManyToOne.php | 5 +++--
lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php | 1 -
lib/Views/aggregator/Plugin/views/argument/Iid.php | 2 +-
lib/Views/node/Plugin/views/argument/CreatedWeek.php | 1 +
lib/Views/node/Plugin/views/argument/CreatedYear.php | 1 +
lib/Views/node/Plugin/views/argument/CreatedYearMonth.php | 1 +
lib/Views/node/Plugin/views/argument/UidRevision.php | 4 ++--
lib/Views/search/Plugin/views/argument/Search.php | 2 +-
lib/Views/user/Plugin/views/argument/RolesRid.php | 2 +-
modules/taxonomy.views.inc | 2 +-
11 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
index e4a23db0fc1f..0d4ac86124c4 100644
--- a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
@@ -40,6 +40,9 @@
*
* @ingroup views_argument_handlers
*/
+
+/**
+ */
class ArgumentPluginBase extends Handler {
var $validator = NULL;
diff --git a/lib/Drupal/views/Plugin/views/argument/ManyToOne.php b/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
index a3a689bbf362..37c3095e8886 100644
--- a/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
+++ b/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
@@ -8,6 +8,7 @@
namespace Drupal\views\Plugin\views\argument;
use Drupal\Core\Annotation\Plugin;
+use Drupal\views\ManyToOneHelper;
/**
* An argument handler for use in fields that have a many to one relationship
@@ -31,7 +32,7 @@
class ManyToOne extends ArgumentPluginBase {
function init(&$view, &$options) {
parent::init($view, $options);
- $this->helper = new views_many_to_one_helper($this);
+ $this->helper = new ManyToOneHelper($this);
// Ensure defaults for these, during summaries and stuff:
$this->operator = 'or';
@@ -52,7 +53,7 @@ function option_definition() {
$this->helper->option_definition($options);
}
else {
- $helper = new views_many_to_one_helper($this);
+ $helper = new ManyToOneHelper($this);
$helper->option_definition($options);
}
diff --git a/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php b/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php
index 2ff6722a9175..59392ead4ff1 100644
--- a/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php
+++ b/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php
@@ -17,7 +17,6 @@
* @Plugin(
* plugin_id = "taxonomy_term",
* base_table = "taxonomy_term_data",
- * created_column = "created",
* title = @Translation("Taxonomy terms"),
* path_field = {
* "id" = "tid",
diff --git a/lib/Views/aggregator/Plugin/views/argument/Iid.php b/lib/Views/aggregator/Plugin/views/argument/Iid.php
index e27482dd13a2..5a311929d8ae 100644
--- a/lib/Views/aggregator/Plugin/views/argument/Iid.php
+++ b/lib/Views/aggregator/Plugin/views/argument/Iid.php
@@ -21,7 +21,7 @@
* plugin_id = "aggregator_iid"
* )
*/
-class views_handler_argument_aggregator_iid extends Numeric {
+class Iid extends Numeric {
/**
* Override the behavior of title(). Get the title of the category.
*/
diff --git a/lib/Views/node/Plugin/views/argument/CreatedWeek.php b/lib/Views/node/Plugin/views/argument/CreatedWeek.php
index a40a655850a8..d71bc92f9cb0 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedWeek.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedWeek.php
@@ -12,6 +12,7 @@
/**
* @Plugin(
* plugin_id = "node_created_week"
+ * )
*/
class CreatedWeek extends Date {
/**
diff --git a/lib/Views/node/Plugin/views/argument/CreatedYear.php b/lib/Views/node/Plugin/views/argument/CreatedYear.php
index 0559ec83a250..75e44ab7e6c4 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedYear.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedYear.php
@@ -12,6 +12,7 @@
/**
* @Plugin(
* plugin_id = "node_created_year"
+ * )
*/
class CreatedYear extends Date {
/**
diff --git a/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php b/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
index 0133ca90d216..ce28b7856eed 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
@@ -12,6 +12,7 @@
/**
* @Plugin(
* plugin_id = "node_created_year_month"
+ * )
*/
class CreatedYearMonth extends Date {
/**
diff --git a/lib/Views/node/Plugin/views/argument/UidRevision.php b/lib/Views/node/Plugin/views/argument/UidRevision.php
index 241799bf8ba2..6eacec2e4536 100644
--- a/lib/Views/node/Plugin/views/argument/UidRevision.php
+++ b/lib/Views/node/Plugin/views/argument/UidRevision.php
@@ -7,7 +7,7 @@
namespace Views\node\Plugin\views\argument;
-use Views\user\Plugin\views\argument\UserUid;
+use Views\user\Plugin\views\argument\Uid;
use Drupal\Core\Annotation\Plugin;
/**
@@ -20,7 +20,7 @@
* plugin_id = "node_uid_revision"
* )
*/
-class UidRevision extends UserUid {
+class UidRevision extends Uid {
function query($group_by = FALSE) {
$this->ensure_my_table();
$placeholder = $this->placeholder();
diff --git a/lib/Views/search/Plugin/views/argument/Search.php b/lib/Views/search/Plugin/views/argument/Search.php
index f6cd2195039d..b1059db6137c 100644
--- a/lib/Views/search/Plugin/views/argument/Search.php
+++ b/lib/Views/search/Plugin/views/argument/Search.php
@@ -5,7 +5,7 @@
* Definition of views_handler_argument_search.
*/
-namespace Views\node\Plugin\views\argument;
+namespace Views\search\Plugin\views\argument;
use Drupal\views\Join;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
diff --git a/lib/Views/user/Plugin/views/argument/RolesRid.php b/lib/Views/user/Plugin/views/argument/RolesRid.php
index 989e235ad9f5..18bc5d4e8b6e 100644
--- a/lib/Views/user/Plugin/views/argument/RolesRid.php
+++ b/lib/Views/user/Plugin/views/argument/RolesRid.php
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = "user_roles_rid"
+ * plugin_id = "users_roles_rid"
* )
*/
class RolesRid extends ManyToOne {
diff --git a/modules/taxonomy.views.inc b/modules/taxonomy.views.inc
index 71d5471e19f3..4232fcdf22b3 100644
--- a/modules/taxonomy.views.inc
+++ b/modules/taxonomy.views.inc
@@ -160,7 +160,7 @@ function taxonomy_views_data() {
'filter' => array(
'title' => t('Term'),
'help' => t('Taxonomy term chosen from autocomplete or select widget.'),
- 'plugin_id' => 'taxonomy_tid',
+ 'plugin_id' => 'taxonomy_index_tid',
'hierarchy table' => 'taxonomy_term_hierarchy',
'numeric' => TRUE,
),
--
GitLab