From d9c68d48d4b54df5123d968c5704f7fe94a5959d Mon Sep 17 00:00:00 2001 From: Daniel Wehner Date: Sun, 29 Jul 2012 16:40:37 -0500 Subject: [PATCH] convert users and translations as well --- ...r_field_user_language.inc => Language.php} | 12 +++- .../views/field/{UserLink.php => Link.php} | 0 ...ld_user_link_cancel.inc => LinkCancel.php} | 12 +++- ..._field_user_link_edit.inc => LinkEdit.php} | 12 +++- ...s_handler_field_user_mail.inc => Mail.php} | 13 +++- ...d_user_permissions.inc => Permissions.php} | 13 +++- ...ler_field_user_picture.inc => Picture.php} | 11 +++- ...handler_field_user_roles.inc => Roles.php} | 11 +++- ...er_filter_user_current.inc => Current.php} | 11 +++- ...r_user_permissions.inc => Permissions.php} | 11 +++- ...andler_filter_user_roles.inc => Roles.php} | 11 +++- modules/user.views.inc | 63 +++++++------------ 12 files changed, 131 insertions(+), 49 deletions(-) rename lib/Views/user/Plugin/views/field/{views_handler_field_user_language.inc => Language.php} (83%) rename lib/Views/user/Plugin/views/field/{UserLink.php => Link.php} (100%) rename lib/Views/user/Plugin/views/field/{views_handler_field_user_link_cancel.inc => LinkCancel.php} (79%) rename lib/Views/user/Plugin/views/field/{views_handler_field_user_link_edit.inc => LinkEdit.php} (80%) rename lib/Views/user/Plugin/views/field/{views_handler_field_user_mail.inc => Mail.php} (86%) rename lib/Views/user/Plugin/views/field/{views_handler_field_user_permissions.inc => Permissions.php} (89%) rename lib/Views/user/Plugin/views/field/{views_handler_field_user_picture.inc => Picture.php} (95%) rename lib/Views/user/Plugin/views/field/{views_handler_field_user_roles.inc => Roles.php} (90%) rename lib/Views/user/Plugin/views/filter/{views_handler_filter_user_current.inc => Current.php} (81%) rename lib/Views/user/Plugin/views/filter/{views_handler_filter_user_permissions.inc => Permissions.php} (84%) rename lib/Views/user/Plugin/views/filter/{views_handler_filter_user_roles.inc => Roles.php} (80%) diff --git a/lib/Views/user/Plugin/views/field/views_handler_field_user_language.inc b/lib/Views/user/Plugin/views/field/Language.php similarity index 83% rename from lib/Views/user/Plugin/views/field/views_handler_field_user_language.inc rename to lib/Views/user/Plugin/views/field/Language.php index d8e6997351b..146800a36f1 100644 --- a/lib/Views/user/Plugin/views/field/views_handler_field_user_language.inc +++ b/lib/Views/user/Plugin/views/field/Language.php @@ -5,12 +5,22 @@ * Definition of views_handler_field_user_language. */ +namespace Views\user\Plugin\views\field; + +use Drupal\Core\Annotation\Plugin; + /** * Views field handler for user language. * * @ingroup views_field_handlers */ -class user_language extends User { + +/** + * @Plugin( + * plugin_id = "user_language" + * ) + */ +class Language extends User { function render_link($data, $values) { $uid = $this->get_value($values, 'uid'); diff --git a/lib/Views/user/Plugin/views/field/UserLink.php b/lib/Views/user/Plugin/views/field/Link.php similarity index 100% rename from lib/Views/user/Plugin/views/field/UserLink.php rename to lib/Views/user/Plugin/views/field/Link.php diff --git a/lib/Views/user/Plugin/views/field/views_handler_field_user_link_cancel.inc b/lib/Views/user/Plugin/views/field/LinkCancel.php similarity index 79% rename from lib/Views/user/Plugin/views/field/views_handler_field_user_link_cancel.inc rename to lib/Views/user/Plugin/views/field/LinkCancel.php index d66f98f8e00..c60612d5112 100644 --- a/lib/Views/user/Plugin/views/field/views_handler_field_user_link_cancel.inc +++ b/lib/Views/user/Plugin/views/field/LinkCancel.php @@ -5,12 +5,22 @@ * Definition of views_handler_field_user_link_cancel. */ +namespace Views\user\Plugin\views\field; + +use Drupal\Core\Annotation\Plugin; + /** * Field handler to present a link to user cancel. * * @ingroup views_field_handlers */ -class views_handler_field_user_link_cancel extends views_handler_field_user_link { + +/** + * @Plugin( + * plugin_id = "user_link_cancel" + * ) + */ +class views_handler_field_user_link_cancel extends Link { function render_link($data, $values) { $uid = $values->{$this->aliases['uid']}; diff --git a/lib/Views/user/Plugin/views/field/views_handler_field_user_link_edit.inc b/lib/Views/user/Plugin/views/field/LinkEdit.php similarity index 80% rename from lib/Views/user/Plugin/views/field/views_handler_field_user_link_edit.inc rename to lib/Views/user/Plugin/views/field/LinkEdit.php index 252cecdb05b..540a6029b09 100644 --- a/lib/Views/user/Plugin/views/field/views_handler_field_user_link_edit.inc +++ b/lib/Views/user/Plugin/views/field/LinkEdit.php @@ -5,12 +5,22 @@ * Definition of views_handler_field_user_link_edit. */ +namespace Views\user\Plugin\views\field; + +use Drupal\Core\Annotation\Plugin; + /** * Field handler to present a link to user edit. * * @ingroup views_field_handlers */ -class views_handler_field_user_link_edit extends views_handler_field_user_link { + +/** + * @Plugin( + * plugin_id = "user_link_edit" + * ) + */ +class LinkEdit extends Link { function render_link($data, $values) { // Build a pseudo account object to be able to check the access. $account = entity_create('user', array()); diff --git a/lib/Views/user/Plugin/views/field/views_handler_field_user_mail.inc b/lib/Views/user/Plugin/views/field/Mail.php similarity index 86% rename from lib/Views/user/Plugin/views/field/views_handler_field_user_mail.inc rename to lib/Views/user/Plugin/views/field/Mail.php index 70652a4bfb1..eb7704eed60 100644 --- a/lib/Views/user/Plugin/views/field/views_handler_field_user_mail.inc +++ b/lib/Views/user/Plugin/views/field/Mail.php @@ -5,12 +5,23 @@ * Definition of views_handler_field_user_mail. */ +namespace Views\user\Plugin\views\field; + +use Drupal\Core\Annotation\Plugin; + +/** /** * Field handler to provide acess control for the email field. * * @ingroup views_field_handlers */ -class user_mail extends User { + +/** + * @Plugin( + * plugin_id = "user_mail" + * ) + */ +class Mail extends User { function option_definition() { $options = parent::option_definition(); $options['link_to_user'] = array('default' => 'mailto'); diff --git a/lib/Views/user/Plugin/views/field/views_handler_field_user_permissions.inc b/lib/Views/user/Plugin/views/field/Permissions.php similarity index 89% rename from lib/Views/user/Plugin/views/field/views_handler_field_user_permissions.inc rename to lib/Views/user/Plugin/views/field/Permissions.php index edc9c44615e..5edde3e6cb0 100644 --- a/lib/Views/user/Plugin/views/field/views_handler_field_user_permissions.inc +++ b/lib/Views/user/Plugin/views/field/Permissions.php @@ -5,12 +5,23 @@ * Definition of views_handler_field_user_permissions. */ +namespace Views\user\Plugin\views\field; + +use Drupal\Core\Annotation\Plugin; +use Drupal\views\Plugin\views\field\PrerenderList; + /** * Field handler to provide a list of permissions. * * @ingroup views_field_handlers */ -class views_handler_field_user_permissions extends views_handler_field_prerender_list { + +/** + * @Plugin( + * plugin_id = "user_permissions" + * ) + */ +class Permissions extends PrerenderList { function construct() { parent::construct(); $this->additional_fields['uid'] = array('table' => 'users', 'field' => 'uid'); diff --git a/lib/Views/user/Plugin/views/field/views_handler_field_user_picture.inc b/lib/Views/user/Plugin/views/field/Picture.php similarity index 95% rename from lib/Views/user/Plugin/views/field/views_handler_field_user_picture.inc rename to lib/Views/user/Plugin/views/field/Picture.php index a8e465d683f..b12e4aca21d 100644 --- a/lib/Views/user/Plugin/views/field/views_handler_field_user_picture.inc +++ b/lib/Views/user/Plugin/views/field/Picture.php @@ -5,6 +5,9 @@ * Definition of views_handler_field_user_picture. */ +namespace Views\user\Plugin\views\field; + +use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\field\FieldPluginBase; /** @@ -12,7 +15,13 @@ use Drupal\views\Plugin\views\field\FieldPluginBase; * * @ingroup views_field_handlers */ -class views_handler_field_user_picture extends FieldPluginBase { + +/** + * @Plugin( + * plugin_id = "user_picture" + * ) + */ +class Picture extends FieldPluginBase { function construct() { parent::construct(); $this->additional_fields['uid'] = 'uid'; diff --git a/lib/Views/user/Plugin/views/field/views_handler_field_user_roles.inc b/lib/Views/user/Plugin/views/field/Roles.php similarity index 90% rename from lib/Views/user/Plugin/views/field/views_handler_field_user_roles.inc rename to lib/Views/user/Plugin/views/field/Roles.php index b734eb714dd..f27182f3c8f 100644 --- a/lib/Views/user/Plugin/views/field/views_handler_field_user_roles.inc +++ b/lib/Views/user/Plugin/views/field/Roles.php @@ -5,6 +5,9 @@ * Definition of views_handler_field_user_roles. */ +namespace Views\user\Plugin\views\field; + +use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\field\PrerenderList; /** @@ -12,7 +15,13 @@ use Drupal\views\Plugin\views\field\PrerenderList; * * @ingroup views_field_handlers */ -class views_handler_field_user_roles extends PrerenderList { + +/** + * @Plugin( + * plugin_id = "user_roles" + * ) + */ +class Roles extends PrerenderList { function construct() { parent::construct(); $this->additional_fields['uid'] = array('table' => 'users', 'field' => 'uid'); diff --git a/lib/Views/user/Plugin/views/filter/views_handler_filter_user_current.inc b/lib/Views/user/Plugin/views/filter/Current.php similarity index 81% rename from lib/Views/user/Plugin/views/filter/views_handler_filter_user_current.inc rename to lib/Views/user/Plugin/views/filter/Current.php index 56106eac533..e266ed07a80 100644 --- a/lib/Views/user/Plugin/views/filter/views_handler_filter_user_current.inc +++ b/lib/Views/user/Plugin/views/filter/Current.php @@ -5,6 +5,9 @@ * Definition of views_handler_filter_user_current. */ +namespace Views\user\Plugin\views\filter; + +use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\filter\BooleanOperator; /** @@ -12,7 +15,13 @@ use Drupal\views\Plugin\views\filter\BooleanOperator; * * @ingroup views_filter_handlers */ -class views_handler_filter_user_current extends BooleanOperator { + +/** + * @Plugin( + * plugin_id = "user_current" + * ) + */ +class Current extends BooleanOperator { function construct() { parent::construct(); $this->value_value = t('Is the logged in user'); diff --git a/lib/Views/user/Plugin/views/filter/views_handler_filter_user_permissions.inc b/lib/Views/user/Plugin/views/filter/Permissions.php similarity index 84% rename from lib/Views/user/Plugin/views/filter/views_handler_filter_user_permissions.inc rename to lib/Views/user/Plugin/views/filter/Permissions.php index bf163a16797..157b4c70985 100644 --- a/lib/Views/user/Plugin/views/filter/views_handler_filter_user_permissions.inc +++ b/lib/Views/user/Plugin/views/filter/Permissions.php @@ -5,6 +5,9 @@ * Definition of views_handler_filter_user_permissions. */ +namespace Views\user\Plugin\views\filter; + +use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\filter\ManyToOne; /** @@ -12,7 +15,13 @@ use Drupal\views\Plugin\views\filter\ManyToOne; * * @ingroup views_filter_handlers */ -class views_handler_filter_user_permissions extends ManyToOne { + +/** + * @Plugin( + * plugin_id = "user_permissions" + * ) + */ +class Permissions extends ManyToOne { function get_value_options() { $module_info = system_get_info('module'); diff --git a/lib/Views/user/Plugin/views/filter/views_handler_filter_user_roles.inc b/lib/Views/user/Plugin/views/filter/Roles.php similarity index 80% rename from lib/Views/user/Plugin/views/filter/views_handler_filter_user_roles.inc rename to lib/Views/user/Plugin/views/filter/Roles.php index dbceece2a9b..7488179d000 100644 --- a/lib/Views/user/Plugin/views/filter/views_handler_filter_user_roles.inc +++ b/lib/Views/user/Plugin/views/filter/Roles.php @@ -5,6 +5,9 @@ * Definition of views_handler_filter_user_roles. */ +namespace Views\user\Plugin\views\filter; + +use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\filter\ManyToOne; /** @@ -12,7 +15,13 @@ use Drupal\views\Plugin\views\filter\ManyToOne; * * @ingroup views_filter_handlers */ -class views_handler_filter_user_roles extends ManyToOne { + +/** + * @Plugin( + * plugin_id = "user_roles" + * ) + */ +class Roles extends ManyToOne { function get_value_options() { $this->value_options = user_roles(TRUE); unset($this->value_options[DRUPAL_AUTHENTICATED_RID]); diff --git a/modules/user.views.inc b/modules/user.views.inc index c7f5efd58d4..d236dc44089 100644 --- a/modules/user.views.inc +++ b/modules/user.views.inc @@ -47,16 +47,16 @@ function user_views_data() { 'title' => t('Uid'), 'help' => t('The user ID'), // The help that appears on the UI, 'field' => array( - 'handler' => 'views_handler_field_user', + 'plugin_id' => 'user', 'click sortable' => TRUE, ), 'argument' => array( - 'handler' => 'views_handler_argument_user_uid', + 'plugin_id' => 'user_uid', 'name field' => 'name', // display this field in the summary ), 'filter' => array( 'title' => t('Name'), - 'handler' => 'views_handler_filter_user_name', + 'plugin_id' => 'user_name', ), 'sort' => array( 'plugin_id' => 'standard', @@ -104,7 +104,7 @@ function user_views_data() { 'title' => t('Current'), 'help' => t('Filter the view to the currently logged in user.'), 'filter' => array( - 'handler' => 'views_handler_filter_user_current', + 'plugin_id' => 'user_current', 'type' => 'yes-no', ), ); @@ -114,7 +114,7 @@ function user_views_data() { 'title' => t('Name'), // The item it appears as on the UI, 'help' => t('The user or author name.'), // The help that appears on the UI, 'field' => array( - 'handler' => 'views_handler_field_user_name', + 'plugin_id' => 'user_name', 'click sortable' => TRUE, ), 'sort' => array( @@ -136,7 +136,7 @@ function user_views_data() { 'title' => t('E-mail'), // The item it appears as on the UI, 'help' => t('Email address for a given user. This field is normally not shown to users, so be cautious when using it.'), // The help that appears on the UI, 'field' => array( - 'handler' => 'views_handler_field_user_mail', + 'plugin_id' => 'user_mail', 'click sortable' => TRUE, ), 'sort' => array( @@ -155,17 +155,17 @@ function user_views_data() { 'title' => t('Language'), // The item it appears as on the UI, 'help' => t('Language of the user'), 'field' => array( - 'handler' => 'views_handler_field_user_language', + 'plugin_id' => 'user_language', 'click sortable' => TRUE, ), 'sort' => array( 'plugin_id' => 'standard', ), 'filter' => array( - 'handler' => 'views_handler_filter_node_language', + 'plugin_id' => 'node_language', ), 'argument' => array( - 'handler' => 'views_handler_argument_node_language', + 'plugin_id' => 'node_language', ), ); @@ -176,7 +176,7 @@ function user_views_data() { 'help' => t("The user's picture, if allowed."), // The help that appears on the UI, // Information for displaying the uid 'field' => array( - 'handler' => 'views_handler_field_user_picture', + 'plugin_id' => 'user_picture', 'click sortable' => TRUE, ), 'sort' => array( @@ -194,7 +194,7 @@ function user_views_data() { 'field' => array( 'title' => t('Link'), 'help' => t('Provide a simple link to the user.'), - 'handler' => 'views_handler_field_user_link', + 'plugin_id' => 'user_link', ), ); @@ -219,7 +219,7 @@ function user_views_data() { 'help' => t('Date in the form of CCYYMMDD.'), 'argument' => array( 'field' => 'created', - 'handler' => 'views_handler_argument_node_created_fulldate', + 'plugin_id' => 'node_created_fulldate', ), ); @@ -228,7 +228,7 @@ function user_views_data() { 'help' => t('Date in the form of YYYYMM.'), 'argument' => array( 'field' => 'created', - 'handler' => 'views_handler_argument_node_created_year_month', + 'plugin_id' => 'node_created_year_month', ), ); @@ -238,7 +238,7 @@ function user_views_data() { 'help' => t('Date in the form of YYYY.'), 'argument' => array( 'field' => 'created', - 'handler' => 'views_handler_argument_node_created_year', + 'plugin_id' => 'node_created_year', ), ); @@ -247,7 +247,7 @@ function user_views_data() { 'help' => t('Date in the form of MM (01 - 12).'), 'argument' => array( 'field' => 'created', - 'handler' => 'views_handler_argument_node_created_month', + 'plugin_id' => 'node_created_month', ), ); @@ -256,7 +256,7 @@ function user_views_data() { 'help' => t('Date in the form of DD (01 - 31).'), 'argument' => array( 'field' => 'created', - 'handler' => 'views_handler_argument_node_created_day', + 'plugin_id' => 'node_created_day', ), ); @@ -265,7 +265,7 @@ function user_views_data() { 'help' => t('Date in the form of WW (01 - 53).'), 'argument' => array( 'field' => 'created', - 'handler' => 'views_handler_argument_node_created_week', + 'plugin_id' => 'node_created_week', ), ); @@ -341,7 +341,7 @@ function user_views_data() { 'field' => array( 'title' => t('Edit link'), 'help' => t('Provide a simple link to edit the user.'), - 'handler' => 'views_handler_field_user_link_edit', + 'plugin_id' => 'user_link_edit', ), ); @@ -349,7 +349,7 @@ function user_views_data() { 'field' => array( 'title' => t('Cancel link'), 'help' => t('Provide a simple link to cancel the user.'), - 'handler' => 'views_handler_field_user_link_cancel', + 'plugin_id' => 'user_link_cancel', ), ); @@ -390,15 +390,15 @@ function user_views_data() { 'title' => t('Roles'), 'help' => t('Roles that a user belongs to.'), 'field' => array( - 'handler' => 'views_handler_field_user_roles', + 'plugin_id' => 'user_roles', 'no group by' => TRUE, ), 'filter' => array( - 'handler' => 'views_handler_filter_user_roles', + 'plugin_id' => 'user_roles', 'allow empty' => TRUE, ), 'argument' => array( - 'handler' => 'views_handler_argument_users_roles_rid', + 'plugin_id' => 'users_roles_rid', 'name table' => 'role', 'name field' => 'name', 'empty field name' => t('No role'), @@ -450,11 +450,11 @@ function user_views_data() { 'title' => t('Permission'), 'help' => t('The user permissions.'), 'field' => array( - 'handler' => 'views_handler_field_user_permissions', + 'plugin_id' => 'user_permissions', 'no group by' => TRUE, ), 'filter' => array( - 'handler' => 'views_handler_filter_user_permissions', + 'plugin_id' => 'user_permissions', ), ); @@ -526,21 +526,6 @@ function user_views_data() { return $data; } -/** - * Implements hook_views_plugins(). - */ -function user_views_plugins() { - return array( - 'argument validator' => array( - 'user' => array( - 'title' => t('User'), - 'handler' => 'views_plugin_argument_validate_user', - 'path' => drupal_get_path('module', 'views') . '/modules/user', // not necessary for most modules - ), - ), - ); -} - /** * Allow replacement of current userid so we can cache these queries */