Commit 81b16bb2 authored by aspilicious's avatar aspilicious Committed by tim.plunkett

renamed plugin_id to id

parent 318e1d1e
......@@ -73,14 +73,14 @@
'title' => t('Quantity'),
'help' => t('Quantity of items.'),
'field' => array(
'plugin_id' => 'numeric',
'id' => 'numeric',
'click sortable' => TRUE,
),
'filter' => array(
'plugin_id' => 'numeric',
'id' => 'numeric',
),
'sort' => array(
'plugin_id' => 'standard',
'id' => 'standard',
),
);
......@@ -90,17 +90,17 @@
'help' => t('Color of item.'),
'field' => array(
'plugin_id' => 'standard',
'id' => 'standard',
'click sortable' => TRUE,
),
'filter' => array(
'plugin_id' => 'string',
'id' => 'string',
),
'argument' => array(
'plugin_id' => 'string',
'id' => 'string',
),
'sort' => array(
'plugin_id' => 'standard',
'id' => 'standard',
),
);
......
......@@ -706,9 +706,9 @@ function views_ui_nojs_submit($form, &$form_state) {
function views_ui_wizard_form_validate($form, &$form_state) {
$wizard = views_ui_get_wizard($form_state['values']['show']['wizard_key']);
$manager = new ViewsPluginManager('wizard');
$definition = $manager->getDefinition($wizard['plugin_id']);
$definition = $manager->getDefinition($wizard['id']);
$form_state['wizard'] = $wizard;
$form_state['wizard_instance'] = $manager->createInstance($wizard['plugin_id'], $definition);
$form_state['wizard_instance'] = $manager->createInstance($wizard['id'], $definition);
$errors = $form_state['wizard_instance']->validate($form, $form_state);
foreach ($errors as $name => $message) {
form_set_error($name, $message);
......
......@@ -88,8 +88,8 @@ function _views_data_process_entity_types(&$data) {
/**
* Fetch the plugin data from cache.
*/
function _views_fetch_plugin_data($type = NULL, $plugin_id = NULL, $reset = FALSE) {
if (!$type && !$plugin_id) {
function _views_fetch_plugin_data($type = NULL, $id = NULL, $reset = FALSE) {
if (!$type && !$id) {
$plugins = array();
$plugin_types = array('access', 'argument', 'argument_default', 'argument_validator', 'cache', 'display_extender', 'display', 'exposed_form', 'localization', 'pager', 'query', 'row', 'style', 'wizard');
foreach ($plugin_types as $plugin_type) {
......@@ -101,11 +101,11 @@ function _views_fetch_plugin_data($type = NULL, $plugin_id = NULL, $reset = FALS
$manager = new ViewsPluginManager($type);
if (!$plugin_id) {
if (!$id) {
return $manager->getDefinitions();
}
else {
return $manager->getDefinition($plugin_id);
return $manager->getDefinition($id);
}
}
......
......@@ -16,11 +16,11 @@
*/
function _views_create_plugin($type, $definition) {
$manager = new ViewsPluginManager($type);
$instance = $manager->createInstance($definition['plugin_id']);
$instance = $manager->createInstance($definition['id']);
$instance->is_plugin = TRUE;
$instance->plugin_type = $type;
$instance->plugin_name = $definition['plugin_id'];
$instance->plugin_name = $definition['id'];
$instance->set_definition($definition);
......@@ -35,7 +35,7 @@ function _views_create_plugin($type, $definition) {
*/
function _views_create_handler($type, $definition) {
$manager = new ViewsPluginManager($type);
$instance = $manager->createInstance($definition['plugin_id']);
$instance = $manager->createInstance($definition['id']);
$instance->is_handler = TRUE;
$instance->handler_type = $type;
......
......@@ -44,7 +44,7 @@ public function getDefinitions() {
}
// merge the new data in
$definitions[$definition['plugin_id']] = $definition;
$definitions[$definition['id']] = $definition;
}
return $definitions;
......
......@@ -11,9 +11,9 @@
use Drupal\Component\Plugin\PluginBase;
abstract class Plugin extends PluginBase {
public function __construct(array $configuration, $plugin_id) {
public function __construct(array $configuration, $id) {
$this->configuration = $configuration;
$this->plugin_id = $plugin_id;
$this->id = $id;
}
/**
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "none",
* id = "none",
* title = @Translation("None"),
* help = @Translation("Will be available to all users."),
* help_topic = "access-none"
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "permission",
* id = "permission",
* title = @Translation("Permission"),
* help = @Translation("Access will be granted to users with the specified permission string."),
* help_topic = "access-perm",
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "role",
* id = "role",
* title = @Translation("Role"),
* help = @Translation("Access will be granted to users with any of the specified roles."),
* help_topic = "access-role",
......
......@@ -17,7 +17,7 @@
/**
* @Plugin(
* plugin_id = "broken"
* id = "broken"
* )
*/
class Broken extends AreaPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @Plugin(
* plugin_id = "result"
* id = "result"
* )
*/
class Result extends AreaPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @Plugin(
* plugin_id = "text"
* id = "text"
* )
*/
class Text extends AreaPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @Plugin(
* plugin_id = "text_custom"
* id = "text_custom"
* )
*/
class TextCustom extends AreaPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @Plugin(
* plugin_id = "view"
* id = "view"
* )
*/
class View extends AreaPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @Plugin(
* plugin_id = "broken"
* id = "broken"
* )
*/
class Broken extends ArgumentPluginBase {
......
......@@ -30,7 +30,7 @@
/**
* @Plugin(
* plugin_id = "date"
* id = "date"
* )
*/
class Date extends ArgumentPluginBase {
......
......@@ -22,7 +22,7 @@
/**
* @Plugin(
* plugin_id = "formula"
* id = "formula"
* )
*/
class Formula extends ArgumentPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @Plugin(
* plugin_id = "groupby_numeric"
* id = "groupby_numeric"
* )
*/
class GroupByNumeric extends ArgumentPluginBase {
......
......@@ -26,7 +26,7 @@
/**
* @Plugin(
* plugin_id = "many_to_one"
* id = "many_to_one"
* )
*/
class ManyToOne extends ArgumentPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @Plugin(
* plugin_id = "null"
* id = "null"
* )
*/
class Null extends ArgumentPluginBase {
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "numeric"
* id = "numeric"
* )
*/
class Numeric extends ArgumentPluginBase {
......
......@@ -19,7 +19,7 @@
/**
* @Plugin(
* plugin_id = "string"
* id = "string"
* )
*/
class String extends ArgumentPluginBase {
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "fixed",
* id = "fixed",
* title = @Translation("Fixed")
* )
*/
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "php",
* id = "php",
* title = @Translation("PHP Code")
* )
*/
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "raw",
* id = "raw",
* title = @Translation("Raw value from URL")
* )
*/
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "numeric",
* id = "numeric",
* title = @Translation("Numeric")
* )
*/
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "php",
* id = "php",
* title = @Translation("PHP Code")
* )
*/
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "none",
* id = "none",
* title = @Translation("None"),
* help = @Translation("No caching of Views data."),
* help_topic = "cache-none"
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "time",
* id = "time",
* title = @Translation("Time-based"),
* help = @Translation("Simple time-based caching of data."),
* help_topic = "cache-time",
......
......@@ -22,7 +22,7 @@
/**
* @Plugin(
* plugin_id = "attachment",
* id = "attachment",
* title = @Translation("Attachment"),
* help = @Translation("Attachments added to other displays to achieve multiple views in the same view."),
* theme = "views_view",
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "block",
* id = "block",
* title = @Translation("Block"),
* help = @Translation("Display the view as a block."),
* theme = "views_view",
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "default",
* id = "default",
* title = @Translation("Master"),
* help = @Translation("Default settings for this view."),
* theme = "views_view",
......
......@@ -21,7 +21,7 @@
/**
* @Plugin(
* plugin_id = "embed",
* id = "embed",
* title = @Translation("Embed"),
* help = @Translation("Provide a display which can be embedded using the views api."),
* theme = "views_view",
......
......@@ -21,7 +21,7 @@
/**
* @Plugin(
* plugin_id = "feed",
* id = "feed",
* title = @Translation("Feed"),
* help = @Translation("Display the view as a feed, such as an RSS feed."),
* uses_hook_menu = TRUE,
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "page",
* id = "page",
* title = @Translation("Page"),
* help = @Translation("Display the view as a page, with a URL and menu links."),
* uses_hook_menu = TRUE,
......
......@@ -11,7 +11,7 @@
/**
* @Plugin(
* plugin_id = "default",
* id = "default",
* title = @Translation("Empty display extender"),
* help = @Translation("Default settings for this view."),
* enabled = FALSE,
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "basic",
* id = "basic",
* title = @Translation("Basic"),
* help = @Translation("Basic exposed form"),
* uses_options = TRUE,
......
......@@ -18,7 +18,7 @@
/**
* @Plugin(
* plugin_id = "input_required",
* id = "input_required",
* title = @Translation("Input required"),
* help = @Translation("An exposed form that only renders a view if the form contains user input."),
* uses_options = TRUE,
......
......@@ -27,7 +27,7 @@
/**
* @plugin(
* plugin_id = "boolean"
* id = "boolean"
* )
*/
class Boolean extends FieldPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @Plugin(
* plugin_id = "broken"
* id = "broken"
* )
*/
class Broken extends FieldPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @plugin(
* plugin_id = "contextual_links"
* id = "contextual_links"
* )
*/
class ContextualLinks extends FieldPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @plugin(
* plugin_id = "counter"
* id = "counter"
* )
*/
class Counter extends FieldPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @plugin(
* plugin_id = "custom"
* id = "custom"
* )
*/
class Custom extends FieldPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @plugin(
* plugin_id = "date"
* id = "date"
* )
*/
class Date extends FieldPluginBase {
......
......@@ -23,7 +23,7 @@
/**
* @plugin(
* plugin_id = "entity"
* id = "entity"
* )
*/
class Entity extends FieldPluginBase {
......
......@@ -50,7 +50,7 @@
/**
* @plugin(
* plugin_id = "standard"
* id = "standard"
* )
*/
class FieldPluginBase extends Handler {
......
......@@ -15,7 +15,7 @@
/**
* @plugin(
* plugin_id = "file_size"
* id = "file_size"
* )
*/
class FileSize extends FieldPluginBase {
......
......@@ -20,7 +20,7 @@
/**
* @plugin(
* plugin_id = "machine_name"
* id = "machine_name"
* )
*/
class MachineName extends FieldPluginBase {
......
......@@ -23,7 +23,7 @@
/**
* @plugin(
* plugin_id = "markup"
* id = "markup"
* )
*/
class Markup extends FieldPluginBase {
......
......@@ -21,7 +21,7 @@
/**
* @plugin(
* plugin_id = "math"
* id = "math"
* )
*/
class Math extends FieldPluginBase {
......
......@@ -21,7 +21,7 @@
/**
* @plugin(
* plugin_id = "numeric"
* id = "numeric"
* )
*/
class Numeric extends FieldPluginBase {
......
......@@ -22,7 +22,7 @@
/**
* @plugin(
* plugin_id = "prerender_list"
* id = "prerender_list"
* )
*/
class PrerenderList extends FieldPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @plugin(
* plugin_id = "serialized"
* id = "serialized"
* )
*/
class Serialized extends FieldPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @plugin(
* plugin_id = "time_interval"
* id = "time_interval"
* )
*/
class TimeInterval extends FieldPluginBase {
......
......@@ -17,7 +17,7 @@
/**
* @plugin(
* plugin_id = "url"
* id = "url"
* )
*/
class Url extends FieldPluginBase {
......
......@@ -16,7 +16,7 @@
/**
* @plugin(
* plugin_id = "xss"
* id = "xss"
* )
*/
class Xss extends FieldPluginBase {
......
......@@ -28,7 +28,7 @@
/**
* @plugin(
* plugin_id = "boolean"
* id = "boolean"
* )
*/