' . check_plain(file_get_contents(drupal_get_path('module', 'views') . '/theme/views-view-field.tpl.php')) . '';
$form['analysis'] = array(
@@ -2189,7 +2240,7 @@ class views_plugin_display extends views_plugin {
);
$exposed_form = $this->get_option('exposed_form');
- $form['exposed_form']['type'] = array(
+ $form['exposed_form']['type'] = array(
'#type' => 'radios',
'#options' => views_fetch_plugin_names('exposed_form', NULL, array($this->view->base_table)),
'#default_value' => $exposed_form['type'],
@@ -2232,7 +2283,7 @@ class views_plugin_display extends views_plugin {
);
$pager = $this->get_option('pager');
- $form['pager']['type'] = array(
+ $form['pager']['type'] = array(
'#type' => 'radios',
'#options' => views_fetch_plugin_names('pager', empty($this->definition['use pager']) ? 'basic' : NULL, array($this->view->base_table)),
'#default_value' => $pager['type'],
@@ -2287,7 +2338,7 @@ class views_plugin_display extends views_plugin {
$template_path = isset($registry[$theme]['path']) ? $registry[$theme]['path'] . '/' : './';
if (file_exists($template_path . $template)) {
$hint = t('File found in folder @template-path', array('@template-path' => $template_path));
- $template = '
' . $template . '';
+ $template = '
' . $template . '';
}
else {
$template = '
' . $template . ' ' . t('(File not found, in folder @template-path)', array('@template-path' => $template_path)) . '';
@@ -2297,7 +2348,7 @@ class views_plugin_display extends views_plugin {
$fixed[] = $template;
}
- return implode(', ', array_reverse($fixed));
+ return theme('item_list', array('items' => array_reverse($fixed)));
}
/**
@@ -2335,7 +2386,7 @@ class views_plugin_display extends views_plugin {
case 'style_options':
$style = TRUE;
case 'row_options':
- // if row, $style will be empty.
+ // If row, $style will be empty.
$plugin = $this->get_plugin(empty($style) ? 'row' : 'style');
if ($plugin) {
$plugin->options_validate($form[$form_state['section']], $form_state);
@@ -2384,6 +2435,7 @@ class views_plugin_display extends views_plugin {
/**
* Perform any necessary changes to the form values prior to storage.
+ *
* There is no need for this function to actually store the data.
*/
public function options_submit(&$form, &$form_state) {
@@ -2474,7 +2526,7 @@ class views_plugin_display extends views_plugin {
case 'use_ajax':
case 'hide_attachment_summary':
case 'hide_admin_links':
- $this->set_option($section, (bool)$form_state['values'][$section]);
+ $this->set_option($section, (bool) $form_state['values'][$section]);
break;
case 'use_more':
@@ -2499,7 +2551,7 @@ class views_plugin_display extends views_plugin {
$this->set_option($section, $form_state['values'][$section]);
$this->set_option('row_options', array());
- // send ajax form to options page if we use it.
+ // Send ajax form to options page if we use it.
if (!empty($plugin->definition['uses options'])) {
views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('row_options'));
}
@@ -2515,7 +2567,7 @@ class views_plugin_display extends views_plugin {
if ($plugin) {
$this->set_option($section, $form_state['values'][$section]);
$this->set_option('style_options', array());
- // send ajax form to options page if we use it.
+ // Send ajax form to options page if we use it.
if (!empty($plugin->definition['uses options'])) {
views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('style_options'));
}
@@ -2526,7 +2578,7 @@ class views_plugin_display extends views_plugin {
case 'style_options':
$style = TRUE;
case 'row_options':
- // if row, $style will be empty.
+ // If row, $style will be empty.
$plugin = $this->get_plugin(empty($style) ? 'row' : 'style');
if ($plugin) {
$plugin->options_submit($form['options'][$section], $form_state);
@@ -2610,8 +2662,8 @@ class views_plugin_display extends views_plugin {
* Which option should be marked as overridden, for example "filters".
* @param bool $new_state
* Select the new state of the option.
- * - TRUE: Revert to default.
- * - FALSE: Mark it as overridden.
+ * - TRUE: Revert to default.
+ * - FALSE: Mark it as overridden.
*/
public function set_override($section, $new_state = NULL) {
$options = $this->defaultable_sections($section);
@@ -2631,7 +2683,7 @@ class views_plugin_display extends views_plugin {
unset($this->display->display_options[$option]);
}
else {
- // copy existing values into our display.
+ // Copy existing values into our display.
$this->options[$option] = $this->get_option($option);
$this->display->display_options[$option] = $this->options[$option];
}
@@ -2702,7 +2754,12 @@ class views_plugin_display extends views_plugin {
$path = check_url(url($path, $url_options));
- return theme($theme, array('more_url' => $path, 'new_window' => $this->use_more_open_new_window(), 'link_text' => check_plain($this->use_more_text()), 'view' => $this->view));
+ return theme($theme, array(
+ 'more_url' => $path,
+ 'new_window' => $this->use_more_open_new_window(),
+ 'link_text' => check_plain($this->use_more_text()),
+ 'view' => $this->view,
+ ));
}
}
}
@@ -2790,9 +2847,10 @@ class views_plugin_display extends views_plugin {
}
/**
- * Set up any variables on the view prior to execution. These are separated
- * from execute because they are extremely common and unlikely to be
- * overridden on an individual display.
+ * Set up any variables on the view prior to execution.
+ *
+ * These are separated from execute because they are extremely common and
+ * unlikely to be overridden on an individual display.
*/
public function pre_execute() {
$this->view->set_use_ajax($this->use_ajax());
@@ -2955,7 +3013,7 @@ class views_plugin_display extends views_plugin {
*/
public function view_special_blocks($type) {
if ($type == '-exp') {
- // avoid interfering with the admin forms.
+ // Avoid interfering with the admin forms.
if (arg(0) == 'admin' && arg(1) == 'structure' && arg(2) == 'views') {
return;
}
@@ -3011,7 +3069,7 @@ class views_plugin_display extends views_plugin {
$output = '';
// Cut the 's' off because the data is stored as the plural form but we need
- // the singular form. Who designed that anyway? Oh yeah, I did. :(
+ // the singular form.
if ($option != 'header' && $option != 'footer' && $option != 'empty') {
$type = substr($option, 0, -1);
}
@@ -3026,9 +3084,9 @@ class views_plugin_display extends views_plugin {
else {
$handler_type = $type;
}
- // If aggregation is on, the group type might override the actual
- // handler that is in use. This piece of code checks that and,
- // if necessary, sets the override handler.
+ // If aggregation is on, the group type might override the actual handler
+ // that is in use. This piece of code checks that and, if necessary, sets
+ // the override handler.
$override = NULL;
if ($this->use_group_by() && !empty($info['group_type'])) {
if (empty($this->view->query)) {
@@ -3057,8 +3115,8 @@ class views_plugin_display extends views_plugin {
* Special handling for the style export.
*
* Styles are stored as style_plugin and style_options or row_plugin and
- * row_options accordingly. The options are told not to export, and the
- * export for the plugin should export both.
+ * row_options accordingly. The options are told not to export, and the export
+ * for the plugin should export both.
*/
public function export_style($indent, $prefix, $storage, $option, $definition, $parents) {
$output = '';
@@ -3092,7 +3150,7 @@ class views_plugin_display extends views_plugin {
}
/**
- * Special handling for plugin export
+ * Special handling for plugin export.
*
* Plugins other than styles are stored in array with 'type' being the key
* to the plugin. For modern plugins, the options are stored in the 'options'
@@ -3110,7 +3168,7 @@ class views_plugin_display extends views_plugin {
$output .= $indent . $new_prefix . "['$option'] = '$value';\n";
- if ($plugin_type != 'access' && $plugin_type!= 'cache') {
+ if ($plugin_type != 'access' && $plugin_type != 'cache') {
$new_prefix .= "['options']";
}
@@ -3172,7 +3230,7 @@ class views_plugin_display extends views_plugin {
$output = '';
// Cut the 's' off because the data is stored as the plural form but we need
- // the singular form. Who designed that anyway? Oh yeah, I did. :(
+ // the singular form.
if ($option != 'header' && $option != 'footer' && $option != 'empty') {
$type = substr($option, 0, -1);
}
@@ -3190,7 +3248,8 @@ class views_plugin_display extends views_plugin {
$handler = views_get_handler($info['table'], $info['field'], $handler_type);
if ($handler) {
$handler->init($this->view, $info);
- $handler->unpack_translatables($translatable, array_merge($parents, array($type, $info['table'], $info['id'])));
+ $items = array_merge($parents, array($type, $info['table'], $info['id']));
+ $handler->unpack_translatables($translatable, $items);
}
// Prevent reference problems.
@@ -3203,14 +3262,13 @@ class views_plugin_display extends views_plugin {
/**
* Provide some helpful text for the arguments.
*
- * The result should contain of an array with
- * - filter value present: The title of the fieldset in the argument
- * where you can configure what should be done with a given argument.
- * - filter value not present: The tiel of the fieldset in the argument
- * where you can configure what should be done if the argument does not
- * exist.
- * - description: A description about how arguments comes to the display.
- * For example blocks don't get it from url.
+ * The result should contain of an array with:
+ * - filter value present: The title of the fieldset in the argument where
+ * you can configure what should be done with a given argument.
+ * - filter value not present: The tiel of the fieldset in the argument where
+ * you can configure what should be done if the argument does not exist.
+ * - description: A description about how arguments comes to the display. For
+ * example blocks don't get it from url.
*/
public function get_argument_text() {
return array(
@@ -3223,13 +3281,14 @@ class views_plugin_display extends views_plugin {
/**
* Provide some helpful text for pagers.
*
- * The result should contain of an array within
- * - items per page title
+ * The result should contain of an array with:
+ * - items per page title.
+ * - items per page description.
*/
public function get_pager_text() {
return array(
'items per page title' => t('Items to display'),
- 'items per page description' => t('The number of items to display. Enter 0 for no limit.')
+ 'items per page description' => t('The number of items to display. Enter 0 for no limit.'),
);
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_display_attachment.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_display_attachment.inc
index c80771a0..57bd0906 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_display_attachment.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_display_attachment.inc
@@ -22,6 +22,8 @@ class views_plugin_display_attachment extends views_plugin_display {
public function option_definition () {
$options = parent::option_definition();
+ $options['show_title'] = array('default' => FALSE, 'bool' => TRUE);
+ $options['show_title_empty'] = array('default' => FALSE, 'bool' => TRUE);
$options['displays'] = array('default' => array());
$options['attachment_position'] = array('default' => 'before');
$options['inherit_arguments'] = array('default' => TRUE, 'bool' => TRUE);
@@ -88,6 +90,18 @@ class views_plugin_display_attachment extends views_plugin_display {
$attach_to = t('Not defined');
}
+ $options['show_title'] = array(
+ 'category' => 'title',
+ 'title' => t('Show title'),
+ 'value' => $this->get_option('show_title') ? t('Yes') : t('No'),
+ );
+
+ $options['show_title_empty'] = array(
+ 'category' => 'title',
+ 'title' => t('Show title even if view has no results'),
+ 'value' => $this->get_option('show_title_empty') ? t('Yes') : t('No'),
+ );
+
$options['displays'] = array(
'category' => 'attachment',
'title' => t('Attach to'),
@@ -134,6 +148,24 @@ class views_plugin_display_attachment extends views_plugin_display {
parent::options_form($form, $form_state);
switch ($form_state['section']) {
+ case 'show_title':
+ $form['#title'] .= t('Title');
+ $form['show_title'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Show title'),
+ '#description' => t('Do you want to show the title of the attachment?'),
+ '#default_value' => $this->get_option('show_title'),
+ );
+ break;
+ case 'show_title_empty':
+ $form['#title'] .= t('Title');
+ $form['show_title_empty'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Show title for empty view'),
+ '#description' => t('Do you want to show the title of the attachment even if the view has no results?'),
+ '#default_value' => $this->get_option('show_title_empty'),
+ );
+ break;
case 'inherit_arguments':
$form['#title'] .= t('Inherit contextual filters');
$form['inherit_arguments'] = array(
@@ -210,6 +242,8 @@ class views_plugin_display_attachment extends views_plugin_display {
// It is very important to call the parent function here.
parent::options_submit($form, $form_state);
switch ($form_state['section']) {
+ case 'show_title':
+ case 'show_title_empty':
case 'inherit_arguments':
case 'inherit_pager':
case 'render_pager':
@@ -242,7 +276,7 @@ class views_plugin_display_attachment extends views_plugin_display {
$args = $this->get_option('inherit_arguments') ? $this->view->args : array();
$view->set_arguments($args);
- $exposed_input = $this->get_option('inherit_exposed_filters') ? $this->view->exposed_input : array();
+ $exposed_input = $this->get_option('inherit_exposed_filters') && isset($this->view->exposed_input) ? $this->view->exposed_input : array();
$view->set_exposed_input($exposed_input);
$view->set_display($this->display->id);
if ($this->get_option('inherit_pager')) {
@@ -250,7 +284,20 @@ class views_plugin_display_attachment extends views_plugin_display {
$view->display_handler->set_option('pager', $this->view->display[$display_id]->handler->get_option('pager'));
}
- $attachment = $view->execute_display($this->display->id, $args);
+ $attachment_output = $view->execute_display($this->display->id, $args);
+
+ $attachment = '';
+ if ($view->display_handler->get_option('show_title') && $view->display_handler->get_option('title')) {
+ if ($view->display_handler->get_option('show_title_empty') || !empty($view->result)) {
+ $attachment .= theme('html_tag', array(
+ 'element' => array(
+ '#tag' => 'h2',
+ '#value' => $view->display_handler->get_option('title'),
+ ),
+ ));
+ }
+ }
+ $attachment .= $attachment_output;
switch ($this->get_option('attachment_position')) {
case 'before':
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_display_page.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_display_page.inc
index e2cc0177..9b9e900b 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_display_page.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_display_page.inc
@@ -167,6 +167,9 @@ class views_plugin_display_page extends views_plugin_display {
case 'default tab':
$items[$path]['type'] = MENU_DEFAULT_LOCAL_TASK;
break;
+ case 'local action':
+ $items[$path]['type'] = MENU_LOCAL_ACTION;
+ break;
}
// Add context for contextual links.
@@ -311,6 +314,8 @@ class views_plugin_display_page extends views_plugin_display {
case 'default tab':
$menu_str = t('Tab: @title', array('@title' => $menu['title']));
break;
+ case 'local action':
+ $menu_str = t('Local action: @title', array('@title' => $menu['title']));
}
$options['menu'] = array(
@@ -345,6 +350,7 @@ class views_plugin_display_page extends views_plugin_display {
'#field_prefix' => '
' . url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='),
'#field_suffix' => '',
'#attributes' => array('dir'=>'ltr'),
+ '#maxlength' => 255,
);
break;
@@ -360,6 +366,7 @@ class views_plugin_display_page extends views_plugin_display {
if (empty($menu)) {
$menu = array('type' => 'none', 'title' => '', 'weight' => 0);
}
+ $menu_type_dependencies = array('normal', 'tab', 'default tab', 'local action');
$form['menu']['type'] = array(
'#prefix' => '
',
'#suffix' => '
',
@@ -369,7 +376,8 @@ class views_plugin_display_page extends views_plugin_display {
'none' => t('No menu entry'),
'normal' => t('Normal menu entry'),
'tab' => t('Menu tab'),
- 'default tab' => t('Default menu tab')
+ 'default tab' => t('Default menu tab'),
+ 'local action' => t('Local action'),
),
'#default_value' => $menu['type'],
);
@@ -379,14 +387,14 @@ class views_plugin_display_page extends views_plugin_display {
'#type' => 'textfield',
'#default_value' => $menu['title'],
'#description' => t('If set to normal or tab, enter the text to use for the menu item.'),
- '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
+ '#dependency' => array('radio:menu[type]' => $menu_type_dependencies),
);
$form['menu']['description'] = array(
'#title' => t('Description'),
'#type' => 'textfield',
'#default_value' => $menu['description'],
'#description' => t("If set to normal or tab, enter the text to use for the menu item's description."),
- '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
+ '#dependency' => array('radio:menu[type]' => $menu_type_dependencies),
);
// Only display the menu selector if menu module is enabled.
@@ -414,7 +422,7 @@ class views_plugin_display_page extends views_plugin_display {
'#type' => 'textfield',
'#default_value' => isset($menu['weight']) ? $menu['weight'] : 0,
'#description' => t('The lower the weight the higher/further left it will appear.'),
- '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
+ '#dependency' => array('radio:menu[type]' => $menu_type_dependencies),
);
$form['menu']['context'] = array(
'#title' => t('Context'),
@@ -502,8 +510,8 @@ class views_plugin_display_page extends views_plugin_display {
'#type' => 'textfield',
'#default_value' => $tab_options['weight'],
'#size' => 5,
- '#description' => t('If the parent menu item is a tab, enter the weight of the tab. The lower the number, the more to the left it will be.'),
- '#dependency' => array('radio:tab_options[type]' => array('tab')),
+ '#description' => t('Enter the weight of the item. The lower the number, the more to the left it will be.'),
+ '#dependency' => array('radio:tab_options[type]' => array('normal', 'tab')),
);
break;
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_exposed_form.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_exposed_form.inc
index 2bba7302..5493be36 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_exposed_form.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_exposed_form.inc
@@ -128,7 +128,7 @@ class views_plugin_exposed_form extends views_plugin {
$form['autosubmit_hide'] = array(
'#type' => 'checkbox',
'#title' => t('Hide submit button'),
- '#description' => t('Hide submit button if javascript is enabled.'),
+ '#description' => t('Hide submit button if JavaScript is enabled.'),
'#default_value' => $this->options['autosubmit_hide'],
'#dependency' => array(
'edit-exposed-form-options-autosubmit' => array(1),
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_pager.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_pager.inc
index ab458639..0217f4dd 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_pager.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_pager.inc
@@ -50,7 +50,7 @@ class views_plugin_pager extends views_plugin {
* most pagers will not need to override this method.
*/
public function get_items_per_page() {
- return isset($this->options['items_per_page']) ? $this->options['items_per_page'] : 0;
+ return isset($this->options['items_per_page']) ? (int) $this->options['items_per_page'] : 0;
}
/**
@@ -59,7 +59,7 @@ class views_plugin_pager extends views_plugin {
* This is mostly used for things that will override the value.
*/
public function set_items_per_page($items) {
- $this->options['items_per_page'] = $items;
+ $this->options['items_per_page'] = (int) $items;
}
/**
@@ -69,14 +69,14 @@ class views_plugin_pager extends views_plugin {
* so few pagers will need to override this method.
*/
public function get_offset() {
- return isset($this->options['offset']) ? $this->options['offset'] : 0;
+ return isset($this->options['offset']) ? (int) $this->options['offset'] : 0;
}
/**
* Set the page offset, or how many items to skip.
*/
public function set_offset($offset) {
- $this->options['offset'] = $offset;
+ $this->options['offset'] = (int) $offset;
}
/**
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_pager_full.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_pager_full.inc
index fff7691d..578bebee 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_pager_full.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_pager_full.inc
@@ -252,7 +252,7 @@ class views_plugin_pager_full extends views_plugin_pager {
public function query() {
if ($this->items_per_page_exposed()) {
if (!empty($_GET['items_per_page']) && $_GET['items_per_page'] > 0) {
- $this->options['items_per_page'] = $_GET['items_per_page'];
+ $this->options['items_per_page'] = (int) $_GET['items_per_page'];
}
elseif (!empty($_GET['items_per_page']) && $_GET['items_per_page'] == 'All' && $this->options['expose']['items_per_page_options_all']) {
$this->options['items_per_page'] = 0;
@@ -260,16 +260,15 @@ class views_plugin_pager_full extends views_plugin_pager {
}
if ($this->offset_exposed()) {
if (isset($_GET['offset']) && $_GET['offset'] >= 0) {
- $this->options['offset'] = $_GET['offset'];
+ $this->options['offset'] = (int) $_GET['offset'];
}
}
- $limit = $this->options['items_per_page'];
- $offset = $this->current_page * $this->options['items_per_page'] + $this->options['offset'];
+ $limit = $this->get_items_per_page();
+ $offset = $this->current_page * $limit + $this->get_offset();
if (!empty($this->options['total_pages'])) {
if ($this->current_page >= $this->options['total_pages']) {
- $limit = $this->options['items_per_page'];
- $offset = $this->options['total_pages'] * $this->options['items_per_page'];
+ $offset = $this->options['total_pages'] * $limit;
}
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_query_default.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_query_default.inc
index 2911a560..db3e7e27 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_query_default.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_query_default.inc
@@ -248,15 +248,26 @@ class views_plugin_query_default extends views_plugin_query {
public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
- $form['disable_sql_rewrite'] = array(
- '#title' => t('Disable SQL rewriting'),
- '#description' => t('Disabling SQL rewriting will disable node_access checks as well as other modules that implement hook_query_alter().'),
- '#type' => 'checkbox',
- '#default_value' => !empty($this->options['disable_sql_rewrite']),
- '#suffix' => '
'
- . t('WARNING: Disabling SQL rewriting means that node access security is disabled. This may allow users to see data they should not be able to see if your view is misconfigured. Please use this option only if you understand and accept this security risk.')
- . '
',
- );
+ // Establish which query tag will be affected by disable_sql_rewrite.
+ // This 'access query tag' is defined by hook_views_data() for the base table.
+ // e.g. node_views_data()
+ if (!empty($form_state['view']->base_table)) {
+ $base_table = $form_state['view']->base_table;
+ $base_table_data = views_fetch_data($base_table);
+ if (!empty($base_table_data['table']['base']['access query tag'])) {
+ $access_tag = $base_table_data['table']['base']['access query tag'];
+ $disable_rewrite = !empty($this->options['disable_sql_rewrite']);
+ $form['disable_sql_rewrite'] = array(
+ '#title' => t('Disable access checks'),
+ '#description' => t('Do not apply %access_tag checks to this query. Selecting this option omits that tag from the alterable query.', array('%access_tag' => $access_tag)),
+ '#type' => 'checkbox',
+ '#default_value' => $disable_rewrite,
+ '#suffix' => '
'
+ . t('WARNING: Disabling access checks means that %access_tag security is disabled. This may allow users to see data they should not be able to see if your view is misconfigured. Please use this option only if you understand and accept this security risk.', array('%access_tag' => $access_tag))
+ . '
',
+ );
+ }
+ }
$form['distinct'] = array(
'#type' => 'checkbox',
'#title' => t('Distinct'),
@@ -1214,7 +1225,10 @@ class views_plugin_query_default extends views_plugin_query {
}
// This is a formula, using no tables.
elseif (empty($field['table'])) {
- if (!in_array($fieldname, $non_aggregates)) {
+ if (Database::getConnection()->databaseType() != 'pgsql') {
+ $non_aggregates[] = $fieldname;
+ }
+ elseif (!in_array($fieldname, $non_aggregates)) {
$non_aggregates[] = $fieldname;
}
$placeholders = !empty($field['placeholders']) ? $field['placeholders'] : array();
@@ -1224,13 +1238,16 @@ class views_plugin_query_default extends views_plugin_query {
elseif ($this->distinct && !in_array($fieldname, $this->groupby)) {
// d7cx: This code was there, apparently needed for PostgreSQL
// $string = db_driver() == 'pgsql' ? "FIRST($string)" : $string;
- if (!in_array($string, $non_aggregates)) {
+ if (Database::getConnection()->databaseType() == 'pgsql' && !in_array($string, $non_aggregates)) {
$non_aggregates[] = $string;
}
$query->addField(!empty($field['table']) ? $field['table'] : $this->base_table, $field['field'], $fieldname);
}
elseif (empty($field['aggregate'])) {
- if (!in_array($string, $non_aggregates)) {
+ if (Database::getConnection()->databaseType() != 'pgsql') {
+ $non_aggregates[] = $fieldname;
+ }
+ elseif (!in_array($string, $non_aggregates)) {
$non_aggregates[] = $string;
}
$query->addField(!empty($field['table']) ? $field['table'] : $this->base_table, $field['field'], $fieldname);
@@ -1340,8 +1357,9 @@ class views_plugin_query_default extends views_plugin_query {
if (count($this->having)) {
$this->has_aggregate = TRUE;
}
- elseif (!$this->has_aggregate) {
- // Allow 'GROUP BY' even no aggregation function has been set.
+ // Allow 'GROUP BY' even if no aggregation function has been set, but only
+ // when there is a legitimate display_handler.
+ elseif (!$this->has_aggregate && !empty($this->view->display_handler)) {
$this->has_aggregate = $this->view->display_handler->get_option('group_by');
}
if ($this->has_aggregate && (!empty($this->groupby) || !empty($non_aggregates))) {
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_style.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_style.inc
index 6f3cf34c..1433f319 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_style.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_style.inc
@@ -372,6 +372,7 @@ class views_plugin_style extends views_plugin {
$output = '';
foreach ($sets as $set) {
$row = reset($set['rows']);
+ $level = isset($set['level']) ? $set['level'] : 0;
// Render as a grouping set.
if (is_array($row) && isset($row['group'])) {
$output .= theme(views_theme_functions('views_view_grouping', $this->view, $this->display),
@@ -463,7 +464,7 @@ class views_plugin_style extends views_plugin {
// hierarchically positioned set where the current row belongs to.
// While iterating, parent groups, that do not exist yet, are added.
$set = &$sets;
- foreach ($groupings as $info) {
+ foreach ($groupings as $level => $info) {
$field = $info['field'];
$rendered = isset($info['rendered']) ? $info['rendered'] : $group_rendered;
$rendered_strip = isset($info['rendered_strip']) ? $info['rendered_strip'] : FALSE;
@@ -496,6 +497,7 @@ class views_plugin_style extends views_plugin {
// Create the group if it does not exist yet.
if (empty($set[$grouping])) {
$set[$grouping]['group'] = $group_content;
+ $set[$grouping]['level'] = $level;
$set[$grouping]['rows'] = array();
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_style_jump_menu.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_style_jump_menu.inc
index 3d83ea34..418766b1 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_style_jump_menu.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_style_jump_menu.inc
@@ -65,7 +65,7 @@ class views_plugin_style_jump_menu extends views_plugin_style {
'#type' => 'checkbox',
'#title' => t('Hide the "Go" button'),
'#default_value' => !empty($this->options['hide']),
- '#description' => t('If hidden, this button will only be hidden for users with javascript and the page will automatically jump when the select is changed.'),
+ '#description' => t('If hidden, this button will only be hidden for users with JavaScript and the page will automatically jump when the select is changed.'),
);
$form['text'] = array(
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_style_summary_jump_menu.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_style_summary_jump_menu.inc
index 17fdcca9..ee75f24e 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_style_summary_jump_menu.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_style_summary_jump_menu.inc
@@ -66,7 +66,7 @@ class views_plugin_style_summary_jump_menu extends views_plugin_style {
'#type' => 'checkbox',
'#title' => t('Hide the "Go" button'),
'#default_value' => !empty($this->options['hide']),
- '#description' => t('If hidden, this button will only be hidden for users with javascript and the page will automatically jump when the select is changed.'),
+ '#description' => t('If hidden, this button will only be hidden for users with JavaScript and the page will automatically jump when the select is changed.'),
);
$form['text'] = array(
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_style_table.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_style_table.inc
index 75fe3897..54679205 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_style_table.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_style_table.inc
@@ -31,6 +31,7 @@ class views_plugin_style_table extends views_plugin_style {
$options = parent::option_definition();
$options['columns'] = array('default' => array());
+ $options['class'] = array('default' => array());
$options['default'] = array('default' => '');
$options['info'] = array('default' => array());
$options['override'] = array('default' => TRUE, 'bool' => TRUE);
@@ -178,7 +179,7 @@ class views_plugin_style_table extends views_plugin_style {
$form['sticky'] = array(
'#type' => 'checkbox',
- '#title' => t('Enable Drupal style "sticky" table headers (Javascript)'),
+ '#title' => t('Enable Drupal style "sticky" table headers (JavaScript)'),
'#default_value' => !empty($this->options['sticky']),
'#description' => t('(Sticky header effects will not be active for preview below, only on live output.)'),
);
@@ -198,6 +199,14 @@ class views_plugin_style_table extends views_plugin_style {
'#default_value' => $this->options['summary'],
'#maxlength' => 255,
);
+
+ $form['class'] = array(
+ '#type' => 'textfield',
+ '#title' => t('CSS classes'),
+ '#description' => t('Add CSS classes to the table; multiple classes may be separated by spaces.'),
+ '#default_value' => $this->options['class'],
+ '#maxlength' => 255,
+ );
// Note: views UI registers this theme handler on our behalf. Your module
// will have to register your theme handlers if you do stuff like this.
@@ -296,7 +305,7 @@ class views_plugin_style_table extends views_plugin_style {
'#type' => 'checkbox',
'#title' => t('Show the empty text in the table'),
'#default_value' => $this->options['empty_table'],
- '#description' => t('Per default the table is hidden for an empty view. With this option it is posible to show an empty table with the text in it.'),
+ '#description' => t('Per default the table is hidden for an empty view. With this option it is possible to show an empty table with the text in it.'),
);
$form['description_markup'] = array(
diff --git a/sites/all/modules/contrib/views/views/tests/handlers/views_handler_filter_numeric.test b/sites/all/modules/contrib/views/views/tests/handlers/views_handler_filter_numeric.test
index 6cfe2d37..a18e20ac 100644
--- a/sites/all/modules/contrib/views/views/tests/handlers/views_handler_filter_numeric.test
+++ b/sites/all/modules/contrib/views/views/tests/handlers/views_handler_filter_numeric.test
@@ -314,6 +314,38 @@ class ViewsHandlerFilterNumericTest extends ViewsSqlTest {
$this->assertIdenticalResultset($view, $resultset, $this->column_map);
}
+ /**
+ * Tests the limit operators functionality.
+ */
+ public function testFilterNumericExposedLimitOperators() {
+ $filters = $this->getGroupedExposedFilters();
+ $view = $this->getBasicView();
+
+ $available_operators = array('<', '>', 'between');
+
+ $filters['age']['expose'] += array(
+ 'limit_operators' => TRUE,
+ 'available_operators' => drupal_map_assoc($available_operators),
+ );
+
+ $view->display['default']->handler->override_option('filters', $filters);
+
+
+ $this->executeView($view);
+
+ $form = array();
+ $form_state = array();
+ $view->filter['age']->operator_form($form, $form_state);
+
+ $operator = $form['operator'];
+
+ $this->assertTrue(in_array($operator['#default_value'], $available_operators), 'Default value operator found in list of available operators.');
+
+ foreach ($available_operators as $available_operator) {
+ $this->assertTrue($operator['#options'][$available_operator], format_string('@operator found in options', array('@operator' => $available_operator)));
+ }
+ }
+
public function testAllowEmpty() {
$view = $this->getBasicView();
diff --git a/sites/all/modules/contrib/views/views/tests/handlers/views_handler_manytoone.test b/sites/all/modules/contrib/views/views/tests/handlers/views_handler_manytoone.test
new file mode 100644
index 00000000..fb06645e
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/tests/handlers/views_handler_manytoone.test
@@ -0,0 +1,1099 @@
+ 'Handler: Many To One Helper',
+ 'description' => 'Tests the many to one helper handler',
+ 'group' => 'Views Handlers',
+ );
+ }
+
+ /**
+ * Clears views data cache.
+ */
+ protected function clearViewsDataCache() {
+ drupal_static_reset('_views_fetch_data_cache');
+ drupal_static_reset('_views_fetch_data_recursion_protected');
+ drupal_static_reset('_views_fetch_data_fully_loaded');
+ }
+
+ /**
+ * Returns a new term with random properties.
+ *
+ * @param string $vocabulary
+ * Vocabulary ID to create term in.
+ *
+ * @return object
+ * Term with random properties.
+ */
+ protected function createTerm($vocabulary) {
+ $term = new stdClass();
+ $term->name = $this->randomName();
+ $term->description = $this->randomName();
+ // Use the first available text format.
+ $term->format = db_query_range('SELECT format FROM {filter_format}', 0, 1)->fetchField();
+ $term->vid = $vocabulary->vid;
+ taxonomy_term_save($term);
+ return $term;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setUp() {
+ parent::setUp();
+
+ // Create boolean field.
+ $this->fields[0] = array(
+ 'field_name' => 'field_bool',
+ 'type' => 'list_boolean',
+ 'cardinality' => 1,
+ 'settings' => array(
+ 'allowed_values' => array(
+ 0 => '',
+ 1 => '',
+ ),
+ ),
+ );
+ $this->fields[0] = field_create_field($this->fields[0]);
+
+ // Create text list field.
+ $this->fields[1] = array(
+ 'field_name' => 'field_list',
+ 'type' => 'list_text',
+ 'cardinality' => FIELD_CARDINALITY_UNLIMITED,
+ 'settings' => array(
+ 'allowed_values' => array(
+ 1 => '1',
+ 2 => '2',
+ 3 => '3',
+ ),
+ ),
+ );
+ $this->fields[1] = field_create_field($this->fields[1]);
+
+ // Create boolean field instance for article nodes.
+ $instance = array(
+ 'field_name' => $this->fields[0]['field_name'],
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'widget' => array(
+ 'type' => 'options_onoff',
+ ),
+ );
+ $this->instances[0][] = field_create_instance($instance);
+
+ // Create text list field instance for article nodes.
+ $instance = array(
+ 'field_name' => $this->fields[1]['field_name'],
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'widget' => array(
+ 'type' => 'options_buttons',
+ ),
+ );
+ $this->instances[1][] = field_create_instance($instance);
+
+ // Create boolean field instance for users.
+ $instance = array(
+ 'field_name' => $this->fields[0]['field_name'],
+ 'entity_type' => 'user',
+ 'bundle' => 'user',
+ 'widget' => array(
+ 'type' => 'options_onoff',
+ ),
+ );
+ $this->instances[0][] = field_create_instance($instance);
+
+ // Create text list field instance for users.
+ $instance = array(
+ 'field_name' => $this->fields[1]['field_name'],
+ 'entity_type' => 'user',
+ 'bundle' => 'user',
+ 'widget' => array(
+ 'type' => 'options_buttons',
+ ),
+ );
+ $this->instances[1][] = field_create_instance($instance);
+
+ // Create tags field instance for users.
+ $instance = array(
+ 'field_name' => 'field_tags',
+ 'entity_type' => 'user',
+ 'bundle' => 'user',
+ );
+ $this->instances[2][] = field_create_instance($instance);
+
+ // Clear views data cache.
+ $this->clearViewsDataCache();
+
+ // Create 62 tags.
+ $vocabulary = taxonomy_vocabulary_machine_name_load('tags');
+ for ($i = 0; $i < 62; $i++) {
+ $this->terms[] = $this->createTerm($vocabulary);
+ }
+
+ // Create a node where the field_bool is checked, field_list is '1' and
+ // tag is term 2.
+ $node = array();
+ $node['type'] = 'article';
+ $node[$this->fields[0]['field_name']][LANGUAGE_NONE][]['value'] = '1';
+ $node[$this->fields[1]['field_name']][LANGUAGE_NONE][]['value'] = '1';
+ $node['field_tags'][LANGUAGE_NONE][]['tid'] = $this->terms[1]->tid;
+ $this->nodes[0] = $this->drupalCreateNode($node);
+
+ // Create a node where the field_bool is not checked, field_list is empty
+ // and tag is term 1.
+ $node = array();
+ $node['type'] = 'article';
+ $node[$this->fields[0]['field_name']] = array();
+ $node[$this->fields[1]['field_name']] = array();
+ $node['field_tags'][LANGUAGE_NONE][]['tid'] = $this->terms[0]->tid;
+ $this->nodes[1] = $this->drupalCreateNode($node);
+
+ // Create a node where the field_bool is not checked, field_list is empty
+ // and tag is term 1 and 2.
+ $node = array();
+ $node['type'] = 'article';
+ $node[$this->fields[0]['field_name']] = array();
+ $node[$this->fields[1]['field_name']] = array();
+ $node['field_tags'][LANGUAGE_NONE][]['tid'] = $this->terms[0]->tid;
+ $node['field_tags'][LANGUAGE_NONE][]['tid'] = $this->terms[1]->tid;
+ $this->nodes[2] = $this->drupalCreateNode($node);
+
+ // Create a user where field_bool is checked, field_list is '1' and tag is
+ // term 1.
+ $permissions = array('access content');
+ $account = $this->drupalCreateUser($permissions);
+ $account->{$this->fields[0]['field_name']}[LANGUAGE_NONE][]['value'] = '1';
+ $account->{$this->fields[1]['field_name']}[LANGUAGE_NONE][]['value'] = '1';
+ $account->field_tags[LANGUAGE_NONE][]['tid'] = $this->terms[0]->tid;
+ $this->accounts[0] = user_save($account);
+ }
+
+ /**
+ * Tests "none of" filter with terms in excess of JOIN limit selected.
+ */
+ public function testJoinLimitNoneOf() {
+ $view = $this->getJoinLimitNoneOfTestView();
+ $this->executeView($view);
+
+ // Assert that nodes have been created and have expected field values.
+ $value = field_get_items('node', $this->nodes[0], 'field_tags', LANGUAGE_NONE);
+ $value = isset($value[0]['tid']) ? (int) $value[0]['tid'] : 0;
+ $this->assertIdentical($value, 2, 'First node has been created and tags field references term 2.');
+
+ $value = field_get_items('node', $this->nodes[1], 'field_tags', LANGUAGE_NONE);
+ $value = isset($value[0]['tid']) ? (int) $value[0]['tid'] : 0;
+ $this->assertIdentical($value, 1, 'Second node has been created and tags field references term 1.');
+
+ // Assert that user has been created and has expected field values.
+ $value = field_get_items('user', $this->accounts[0], 'field_tags', LANGUAGE_NONE);
+ $value = isset($value[0]['tid']) ? (int) $value[0]['tid'] : 0;
+ $this->assertIdentical($value, 1, 'User has been created and tags field references term 1.');
+
+ // Assert that node id with empty field value matches user id so that the
+ // node would be excluded from the result, if the joins are missing extras.
+ $this->assertIdentical((int) $this->accounts[0]->uid, (int) $this->nodes[1]->nid, 'Node id of second node matches uid of first user.');
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $this->assertEqual($result_count, 1, 'View has one result.');
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $this->assertIdentical($nid, (int) $this->nodes[1]->nid, 'View result has correct node id.');
+ }
+
+ /**
+ * Tests duplicate grouped "none of" filters on boolean field.
+ */
+ public function testGroupedNoneOf() {
+ $view = $this->getGroupedNoneOfTestView();
+ $this->executeView($view);
+
+ // Assert that nodes have been created and have expected field values.
+ $value = field_get_items('node', $this->nodes[0], $this->fields[0]['field_name'], LANGUAGE_NONE);
+ $value = isset($value[0]['value']) ? (int) $value[0]['value'] : 0;
+ $this->assertIdentical($value, 1, 'First node has been created and boolean field is checked.');
+
+ $value = field_get_items('node', $this->nodes[1], $this->fields[0]['field_name'], LANGUAGE_NONE);
+ $this->assertFalse($value, 'Second node has been created and boolean field is not checked.');
+
+ $value = field_get_items('node', $this->nodes[2], $this->fields[0]['field_name'], LANGUAGE_NONE);
+ $this->assertFalse($value, 'Third node has been created and boolean field is not checked.');
+
+ // Assert that user has been created and has expected field values.
+ $value = field_get_items('user', $this->accounts[0], $this->fields[0]['field_name'], LANGUAGE_NONE);
+ $value = isset($value[0]['value']) ? (int) $value[0]['value'] : 0;
+ $this->assertIdentical($value, 1, 'User has been created and boolean field is checked.');
+
+ // Assert that node ID with empty field value matches user ID so that the
+ // node would be excluded from the result, if the joins are missing extras.
+ $this->assertIdentical((int) $this->accounts[0]->uid, (int) $this->nodes[1]->nid, 'Node ID of second node matches UID of first user.');
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $this->assertEqual($result_count, 2, 'View has two results.');
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $result1 = ($nid === (int) $this->nodes[1]->nid);
+ $nid = isset($view->result[1]->nid) ? (int) $view->result[1]->nid : 0;
+ $result2 = ($nid === (int) $this->nodes[2]->nid);
+ $this->assertTrue($result1 && $result2, 'View result has correct node IDs.');
+ }
+
+ /**
+ * Tests duplicate grouped "one of" filters on taxonomy term field.
+ */
+ public function testGroupedOneOf() {
+ $view = $this->getGroupedOneOfTestView();
+ $this->executeView($view);
+
+ // Assert that nodes have been created and have expected field values.
+ $value = field_get_items('node', $this->nodes[0], 'field_tags', LANGUAGE_NONE);
+ $value = isset($value[0]['tid']) ? (int) $value[0]['tid'] : 0;
+ $this->assertIdentical($value, 2, 'First node has been created and tags field references term 2.');
+
+ $value = field_get_items('node', $this->nodes[1], 'field_tags', LANGUAGE_NONE);
+ $value = isset($value[0]['tid']) ? (int) $value[0]['tid'] : 0;
+ $this->assertIdentical($value, 1, 'Second node has been created and tags field references term 1.');
+
+ $value = field_get_items('node', $this->nodes[2], 'field_tags', LANGUAGE_NONE);
+ $value = !empty($value[0]['tid']) && !empty($value[1]['tid']);
+ $this->assertTrue($value, 'Third node has been created and tags field references both terms 1 and 2.');
+
+ // Assert that user has been created and has expected field values.
+ $value = field_get_items('user', $this->accounts[0], 'field_tags', LANGUAGE_NONE);
+ $value = isset($value[0]['tid']) ? (int) $value[0]['tid'] : 0;
+ $this->assertIdentical($value, 1, 'User has been created and tags field references term 1.');
+
+ // Assert that node ID with empty field value matches user ID so that the
+ // node would be excluded from the result, if the joins are missing extras.
+ $this->assertIdentical((int) $this->accounts[0]->uid, (int) $this->nodes[1]->nid, 'Node ID of second node matches UID of first user.');
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $this->assertEqual($result_count, 2, 'View has two results.');
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $result1 = ($nid === (int) $this->nodes[1]->nid);
+ $nid = isset($view->result[1]->nid) ? (int) $view->result[1]->nid : 0;
+ $result2 = ($nid === (int) $this->nodes[2]->nid);
+ $this->assertTrue($result1 && $result2, 'View result has correct node IDs.');
+ }
+
+ /**
+ * Tests exposed filter with "Reduce duplicates." and grouped options.
+ */
+ public function testReducedExposedGroupedOptions() {
+ // Assert that nodes have been created and have expected field values.
+ $value = field_get_items('node', $this->nodes[0], 'field_list', LANGUAGE_NONE);
+ $value = isset($value[0]['value']) ? (int) $value[0]['value'] : 0;
+ $this->assertIdentical($value, 1, 'First node has been created and list field has value 1.');
+
+ $value = field_get_items('node', $this->nodes[1], 'field_list', LANGUAGE_NONE);
+ $this->assertFalse($value, 'Second node has been created and list field is empty.');
+
+ $value = field_get_items('node', $this->nodes[2], 'field_list', LANGUAGE_NONE);
+ $this->assertFalse($value, 'Third node has been created and list field is empty.');
+
+ // Assert that user has been created and has expected field values.
+ $value = field_get_items('user', $this->accounts[0], 'field_list', LANGUAGE_NONE);
+ $value = isset($value[0]['value']) ? (int) $value[0]['value'] : 0;
+ $this->assertIdentical($value, 1, 'User has been created and list field has value 1.');
+
+ // Assert that node ID with empty field value matches user ID so that the
+ // node would be excluded from the result option 1, if the joins are missing
+ // extras.
+ $this->assertIdentical((int) $this->accounts[0]->uid, (int) $this->nodes[1]->nid, 'Node ID of second node matches UID of first user.');
+
+ // Default option: Any.
+ $view = $this->getReducedExposedGroupedOptionsTestView();
+ $this->executeView($view);
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $this->assertEqual($result_count, 3, 'Default option: View has three results.');
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $result1 = ($nid === (int) $this->nodes[0]->nid);
+ $nid = isset($view->result[1]->nid) ? (int) $view->result[1]->nid : 0;
+ $result2 = ($nid === (int) $this->nodes[1]->nid);
+ $nid = isset($view->result[2]->nid) ? (int) $view->result[2]->nid : 0;
+ $result3 = ($nid === (int) $this->nodes[2]->nid);
+ $this->assertTrue($result1 && $result2 && $result3, 'Default option: View result has correct node ID.');
+
+ // Option 1: Is none of 1 or 2.
+ $view = $this->getReducedExposedGroupedOptionsTestView();
+ $view->set_exposed_input(array(
+ 'field_list_value' => '1',
+ ));
+ $this->executeView($view);
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $this->assertEqual($result_count, 2, 'Option 1: View has two results.');
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $result1 = ($nid === (int) $this->nodes[1]->nid);
+ $nid = isset($view->result[1]->nid) ? (int) $view->result[1]->nid : 0;
+ $result2 = ($nid === (int) $this->nodes[2]->nid);
+ $this->assertTrue($result1 && $result2, 'Option 1: View result has correct node ID.');
+
+ // Option 2: Is one of 1.
+ $view = $this->getReducedExposedGroupedOptionsTestView();
+ $view->set_exposed_input(array(
+ 'field_list_value' => '2',
+ ));
+ $this->executeView($view);
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $this->assertEqual($result_count, 1, 'Option 2: View has one result.');
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $this->assertIdentical($nid, (int) $this->nodes[0]->nid, 'Option 2: View result has correct node ID.');
+
+ // Option 3: Is one of 1 or 2.
+ $view = $this->getReducedExposedGroupedOptionsTestView();
+ $view->set_exposed_input(array(
+ 'field_list_value' => '3',
+ ));
+ $this->executeView($view);
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $this->assertEqual($result_count, 1, 'Option 3: View has one result.');
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $this->assertIdentical($nid, (int) $this->nodes[0]->nid, 'Option 3: View result has correct node ID.');
+
+ /* @todo: Fix and uncomment in issue #3045168.
+ * // Option 4: Is all of 1 and 2.
+ * $view = $this->getReducedExposedGroupedOptionsTestView();
+ * $view->set_exposed_input(array(
+ * 'field_list_value' => '4',
+ * ));
+ * $this->executeView($view);
+ *
+ * // Assert correct result set.
+ * $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 1;
+ * $this->assertEqual($result_count, 0, 'Option 4: View has empty result.');
+ */
+
+ // Option 5: Is empty.
+ $view = $this->getReducedExposedGroupedOptionsTestView();
+ $view->set_exposed_input(array(
+ 'field_list_value' => '5',
+ ));
+ $this->executeView($view);
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $this->assertEqual($result_count, 2, 'Option 5: View has two results.');
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $result1 = ($nid === (int) $this->nodes[1]->nid);
+ $nid = isset($view->result[1]->nid) ? (int) $view->result[1]->nid : 0;
+ $result2 = ($nid === (int) $this->nodes[2]->nid);
+ $this->assertTrue($result1 && $result2, 'Option 5: View result has correct node IDs.');
+
+ // Option 6: Is not empty.
+ $view = $this->getReducedExposedGroupedOptionsTestView();
+ $view->set_exposed_input(array(
+ 'field_list_value' => '6',
+ ));
+ $this->executeView($view);
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $this->assertEqual($result_count, 1, 'Option 6: View has one result.');
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $this->assertIdentical($nid, (int) $this->nodes[0]->nid, 'Option 6: View result has correct node ID.');
+ }
+
+ /**
+ * Tests exposed filter on term ID with grouped options.
+ */
+ public function testTermIdExposedGroupedOptions() {
+ // Assert that nodes have been created and have expected field values.
+ $value = field_get_items('node', $this->nodes[0], 'field_tags', LANGUAGE_NONE);
+ $value = isset($value[0]['tid']) ? (int) $value[0]['tid'] : 0;
+ $this->assertIdentical($value, 2, 'First node has been created and tags field references term 2.');
+
+ $value = field_get_items('node', $this->nodes[1], 'field_tags', LANGUAGE_NONE);
+ $value = isset($value[0]['tid']) ? (int) $value[0]['tid'] : 0;
+ $this->assertIdentical($value, 1, 'Second node has been created and tags field references term 1.');
+
+ // Assert that user has been created and has expected field values.
+ $value = field_get_items('user', $this->accounts[0], 'field_tags', LANGUAGE_NONE);
+ $value = isset($value[0]['tid']) ? (int) $value[0]['tid'] : 0;
+ $this->assertIdentical($value, 1, 'User has been created and tags field references term 1.');
+
+ // Assert that node ID with empty field value matches user ID so that the
+ // node would be excluded from the result option 1, if the joins are missing
+ // extras.
+ $this->assertIdentical((int) $this->accounts[0]->uid, (int) $this->nodes[1]->nid, 'Node ID of second node matches UID of first user.');
+
+ // Default option: Any.
+ $view = $this->getTermIdExposedGroupedOptionsTestView();
+ $this->executeView($view);
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $this->assertEqual($result_count, 3, 'Default option: View has three results.');
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $result1 = ($nid === (int) $this->nodes[0]->nid);
+ $nid = isset($view->result[1]->nid) ? (int) $view->result[1]->nid : 0;
+ $result2 = ($nid === (int) $this->nodes[1]->nid);
+ $nid = isset($view->result[2]->nid) ? (int) $view->result[2]->nid : 0;
+ $result3 = ($nid === (int) $this->nodes[2]->nid);
+ $this->assertTrue($result1 && $result2 && $result3, 'Default option: View result has correct node ID.');
+
+ // Option 1: Is none of 2.
+ $view = $this->getTermIdExposedGroupedOptionsTestView();
+ $view->set_exposed_input(array(
+ 'field_tags_tid' => '1',
+ ));
+ $this->executeView($view);
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $this->assertEqual($result_count, 1, 'Option 1: View has one result.');
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $this->assertIdentical($nid, (int) $this->nodes[1]->nid, 'Option 1: View result has correct node ID.');
+
+ // Option 2: Is none of 1 or 2.
+ $view = $this->getTermIdExposedGroupedOptionsTestView();
+ $view->set_exposed_input(array(
+ 'field_tags_tid' => '2',
+ ));
+ $this->executeView($view);
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 1;
+ $this->assertEqual($result_count, 0, 'Option 2: View has empty result.');
+
+ // Option 3: Is one of 1.
+ $view = $this->getTermIdExposedGroupedOptionsTestView();
+ $view->set_exposed_input(array(
+ 'field_tags_tid' => '3',
+ ));
+ $this->executeView($view);
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $this->assertEqual($result_count, 2, 'Option 3: View has two results.');
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $result1 = ($nid === (int) $this->nodes[1]->nid);
+ $nid = isset($view->result[1]->nid) ? (int) $view->result[1]->nid : 0;
+ $result2 = ($nid === (int) $this->nodes[2]->nid);
+ $this->assertTrue($result1 && $result2, 'Option 3: View result has correct node ID.');
+
+ // Option 4: Is one of 1 or 2.
+ $view = $this->getTermIdExposedGroupedOptionsTestView();
+ $view->set_exposed_input(array(
+ 'field_tags_tid' => '4',
+ ));
+ $this->executeView($view);
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $result1 = ($nid === (int) $this->nodes[0]->nid);
+ $nid = isset($view->result[1]->nid) ? (int) $view->result[1]->nid : 0;
+ $result2 = ($nid === (int) $this->nodes[1]->nid);
+ $nid = isset($view->result[2]->nid) ? (int) $view->result[2]->nid : 0;
+ $result3 = ($nid === (int) $this->nodes[2]->nid);
+ $nid = isset($view->result[3]->nid) ? (int) $view->result[3]->nid : 0;
+ $result4 = ($nid === (int) $this->nodes[2]->nid);
+ $this->assertTrue($result1 && $result2 && $result3 && $result4, 'Option 4: View result has correct node ID.');
+ $this->verbose($view->result);
+ $this->assertEqual($result_count, 4, 'Option 4: View has four results.');
+
+ /* @todo: Fix and uncomment in issue #3045168.
+ * // Option 5: Is all of 1 and 2.
+ * $view = $this->getTermIdExposedGroupedOptionsTestView();
+ * $view->set_exposed_input(array(
+ * 'field_tags_tid' => '5',
+ * ));
+ * $this->executeView($view);
+ *
+ * // Assert correct result set.
+ * $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ * $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ * $this->assertIdentical($nid, (int) $this->nodes[2]->nid, 'Option 5: View result has correct node ID.');
+ * $this->assertIdentical($result_count, 1, 'Option 5: View has one result.');
+ */
+
+ // Option 6: Is empty.
+ $view = $this->getTermIdExposedGroupedOptionsTestView();
+ $view->set_exposed_input(array(
+ 'field_tags_tid' => '6',
+ ));
+ $this->executeView($view);
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 1;
+ $this->assertIdentical($result_count, 0, 'Option 6: View has empty result.');
+
+ // Option 7: Is not empty.
+ $view = $this->getTermIdExposedGroupedOptionsTestView();
+ $view->set_exposed_input(array(
+ 'field_tags_tid' => '7',
+ ));
+ $this->executeView($view);
+
+ // Assert correct result set.
+ $result_count = isset($view->result) && is_array($view->result) ? count($view->result) : 0;
+ $nid = isset($view->result[0]->nid) ? (int) $view->result[0]->nid : 0;
+ $result1 = ($nid === (int) $this->nodes[0]->nid);
+ $nid = isset($view->result[1]->nid) ? (int) $view->result[1]->nid : 0;
+ $result2 = ($nid === (int) $this->nodes[1]->nid);
+ $nid = isset($view->result[2]->nid) ? (int) $view->result[2]->nid : 0;
+ $result3 = ($nid === (int) $this->nodes[2]->nid);
+ $nid = isset($view->result[3]->nid) ? (int) $view->result[3]->nid : 0;
+ $result4 = ($nid === (int) $this->nodes[2]->nid);
+ $this->assertTrue($result1 && $result2 && $result3 && $result4, 'Option 7: View result has correct node ID.');
+ $this->verbose($view->result);
+ $this->assertIdentical($result_count, 4, 'Option 7: View has four results.');
+ }
+
+ /**
+ * Generates test_not view.
+ */
+ protected function getGroupedNoneOfTestView() {
+ $view = new view();
+ $view->name = 'test_not';
+ $view->description = '';
+ $view->tag = 'default';
+ $view->base_table = 'node';
+ $view->human_name = 'test_not';
+ $view->core = 7;
+ $view->api_version = '3.0';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+ /* Display: Master */
+ $handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['use_more_always'] = FALSE;
+ $handler->display->display_options['access']['type'] = 'perm';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'full';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'fields';
+ /* Field: Content: Title */
+ $handler->display->display_options['fields']['title']['id'] = 'title';
+ $handler->display->display_options['fields']['title']['table'] = 'node';
+ $handler->display->display_options['fields']['title']['field'] = 'title';
+ $handler->display->display_options['fields']['title']['label'] = '';
+ $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+ $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+ /* Sort criterion: Content: Nid */
+ $handler->display->display_options['sorts']['nid']['id'] = 'nid';
+ $handler->display->display_options['sorts']['nid']['table'] = 'node';
+ $handler->display->display_options['sorts']['nid']['field'] = 'nid';
+ $handler->display->display_options['filter_groups']['operator'] = 'OR';
+ $handler->display->display_options['filter_groups']['groups'] = array(
+ 1 => 'AND',
+ 2 => 'AND',
+ );
+ /* Filter criterion: Content: Published */
+ $handler->display->display_options['filters']['status']['id'] = 'status';
+ $handler->display->display_options['filters']['status']['table'] = 'node';
+ $handler->display->display_options['filters']['status']['field'] = 'status';
+ $handler->display->display_options['filters']['status']['value'] = 1;
+ $handler->display->display_options['filters']['status']['group'] = 1;
+ $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+ /* Filter criterion: Content: Type */
+ $handler->display->display_options['filters']['type']['id'] = 'type';
+ $handler->display->display_options['filters']['type']['table'] = 'node';
+ $handler->display->display_options['filters']['type']['field'] = 'type';
+ $handler->display->display_options['filters']['type']['value'] = array(
+ 'article' => 'article',
+ );
+ $handler->display->display_options['filters']['type']['group'] = 1;
+ /* Filter criterion: Field: field_bool (field_bool) */
+ $handler->display->display_options['filters']['field_bool_value']['id'] = 'field_bool_value';
+ $handler->display->display_options['filters']['field_bool_value']['table'] = 'field_data_field_bool';
+ $handler->display->display_options['filters']['field_bool_value']['field'] = 'field_bool_value';
+ $handler->display->display_options['filters']['field_bool_value']['operator'] = 'not';
+ $handler->display->display_options['filters']['field_bool_value']['value'] = array(
+ 1 => '1',
+ );
+ $handler->display->display_options['filters']['field_bool_value']['group'] = 1;
+ /* Filter criterion: Field: field_bool (field_bool) */
+ $handler->display->display_options['filters']['field_bool_value_1']['id'] = 'field_bool_value_1';
+ $handler->display->display_options['filters']['field_bool_value_1']['table'] = 'field_data_field_bool';
+ $handler->display->display_options['filters']['field_bool_value_1']['field'] = 'field_bool_value';
+ $handler->display->display_options['filters']['field_bool_value_1']['operator'] = 'not';
+ $handler->display->display_options['filters']['field_bool_value_1']['value'] = array(
+ 1 => '1',
+ );
+ $handler->display->display_options['filters']['field_bool_value_1']['group'] = 2;
+ /* Filter criterion: Content: Type */
+ $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
+ $handler->display->display_options['filters']['type_1']['table'] = 'node';
+ $handler->display->display_options['filters']['type_1']['field'] = 'type';
+ $handler->display->display_options['filters']['type_1']['value'] = array(
+ 'article' => 'article',
+ );
+ $handler->display->display_options['filters']['type_1']['group'] = 2;
+ /* Filter criterion: Content: Published */
+ $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
+ $handler->display->display_options['filters']['status_1']['table'] = 'node';
+ $handler->display->display_options['filters']['status_1']['field'] = 'status';
+ $handler->display->display_options['filters']['status_1']['value'] = '1';
+ $handler->display->display_options['filters']['status_1']['group'] = 2;
+
+ return $view;
+ }
+
+ /**
+ * Generates test_oneof view.
+ */
+ protected function getGroupedOneOfTestView() {
+ $view = new view();
+ $view->name = 'test_oneof';
+ $view->description = '';
+ $view->tag = 'default';
+ $view->base_table = 'node';
+ $view->human_name = 'test_oneof';
+ $view->core = 7;
+ $view->api_version = '3.0';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+ /* Display: Master */
+ $handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['use_more_always'] = FALSE;
+ $handler->display->display_options['access']['type'] = 'perm';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'full';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'fields';
+ /* Field: Content: Title */
+ $handler->display->display_options['fields']['title']['id'] = 'title';
+ $handler->display->display_options['fields']['title']['table'] = 'node';
+ $handler->display->display_options['fields']['title']['field'] = 'title';
+ $handler->display->display_options['fields']['title']['label'] = '';
+ $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+ $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+ /* Sort criterion: Content: Nid */
+ $handler->display->display_options['sorts']['nid']['id'] = 'nid';
+ $handler->display->display_options['sorts']['nid']['table'] = 'node';
+ $handler->display->display_options['sorts']['nid']['field'] = 'nid';
+ $handler->display->display_options['filter_groups']['operator'] = 'OR';
+ $handler->display->display_options['filter_groups']['groups'] = array(
+ 1 => 'AND',
+ 2 => 'AND',
+ );
+ /* Filter criterion: Content: Tags (field_tags) */
+ $handler->display->display_options['filters']['field_tags_tid']['id'] = 'field_tags_tid';
+ $handler->display->display_options['filters']['field_tags_tid']['table'] = 'field_data_field_tags';
+ $handler->display->display_options['filters']['field_tags_tid']['field'] = 'field_tags_tid';
+ $handler->display->display_options['filters']['field_tags_tid']['value'] = array(
+ 1 => '1',
+ );
+ $handler->display->display_options['filters']['field_tags_tid']['group'] = 2;
+ $handler->display->display_options['filters']['field_tags_tid']['reduce_duplicates'] = TRUE;
+ $handler->display->display_options['filters']['field_tags_tid']['type'] = 'select';
+ $handler->display->display_options['filters']['field_tags_tid']['vocabulary'] = 'tags';
+ /* Filter criterion: Content: Tags (field_tags) */
+ $handler->display->display_options['filters']['field_tags_tid_1']['id'] = 'field_tags_tid_1';
+ $handler->display->display_options['filters']['field_tags_tid_1']['table'] = 'field_data_field_tags';
+ $handler->display->display_options['filters']['field_tags_tid_1']['field'] = 'field_tags_tid';
+ $handler->display->display_options['filters']['field_tags_tid_1']['value'] = array(
+ 1 => '1',
+ );
+ $handler->display->display_options['filters']['field_tags_tid_1']['reduce_duplicates'] = TRUE;
+ $handler->display->display_options['filters']['field_tags_tid_1']['type'] = 'select';
+ $handler->display->display_options['filters']['field_tags_tid_1']['vocabulary'] = 'tags';
+ return $view;
+ }
+
+ /**
+ * Generates test_reduced_exposed_grouped_options view.
+ */
+ protected function getReducedExposedGroupedOptionsTestView() {
+ $view = new view();
+ $view->name = 'test_reduced_exposed_grouped_options';
+ $view->description = '';
+ $view->tag = 'default';
+ $view->base_table = 'node';
+ $view->human_name = 'test_reduced_exposed_grouped_options';
+ $view->core = 7;
+ $view->api_version = '3.0';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+ /* Display: Master */
+ $handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['use_more_always'] = FALSE;
+ $handler->display->display_options['access']['type'] = 'perm';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'full';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'fields';
+ /* Field: Content: Title */
+ $handler->display->display_options['fields']['title']['id'] = 'title';
+ $handler->display->display_options['fields']['title']['table'] = 'node';
+ $handler->display->display_options['fields']['title']['field'] = 'title';
+ $handler->display->display_options['fields']['title']['label'] = '';
+ $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+ $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+ /* Sort criterion: Content: Nid */
+ $handler->display->display_options['sorts']['nid']['id'] = 'nid';
+ $handler->display->display_options['sorts']['nid']['table'] = 'node';
+ $handler->display->display_options['sorts']['nid']['field'] = 'nid';
+ /* Filter criterion: Content: Published */
+ $handler->display->display_options['filters']['status']['id'] = 'status';
+ $handler->display->display_options['filters']['status']['table'] = 'node';
+ $handler->display->display_options['filters']['status']['field'] = 'status';
+ $handler->display->display_options['filters']['status']['value'] = 1;
+ $handler->display->display_options['filters']['status']['group'] = 1;
+ $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+ /* Filter criterion: Content: list (field_list) */
+ $handler->display->display_options['filters']['field_list_value']['id'] = 'field_list_value';
+ $handler->display->display_options['filters']['field_list_value']['table'] = 'field_data_field_list';
+ $handler->display->display_options['filters']['field_list_value']['field'] = 'field_list_value';
+ $handler->display->display_options['filters']['field_list_value']['exposed'] = TRUE;
+ $handler->display->display_options['filters']['field_list_value']['expose']['operator_id'] = 'field_list_value_op';
+ $handler->display->display_options['filters']['field_list_value']['expose']['label'] = 'list (field_list)';
+ $handler->display->display_options['filters']['field_list_value']['expose']['operator'] = 'field_list_value_op';
+ $handler->display->display_options['filters']['field_list_value']['expose']['identifier'] = 'field_list_value';
+ $handler->display->display_options['filters']['field_list_value']['is_grouped'] = TRUE;
+ $handler->display->display_options['filters']['field_list_value']['group_info']['label'] = 'list (field_list)';
+ $handler->display->display_options['filters']['field_list_value']['group_info']['identifier'] = 'field_list_value';
+ $handler->display->display_options['filters']['field_list_value']['group_info']['group_items'] = array(
+ 1 => array(
+ 'title' => 'Not 1 or 2',
+ 'operator' => 'not',
+ 'value' => array(
+ 1 => '1',
+ 2 => '2',
+ ),
+ ),
+ 2 => array(
+ 'title' => '1',
+ 'operator' => 'or',
+ 'value' => array(
+ 1 => '1',
+ ),
+ ),
+ 3 => array(
+ 'title' => '1 or 2',
+ 'operator' => 'or',
+ 'value' => array(
+ 1 => '1',
+ 2 => '2',
+ ),
+ ),
+ 4 => array(
+ 'title' => '1 and 2',
+ 'operator' => 'and',
+ 'value' => array(
+ 1 => '1',
+ 2 => '2',
+ ),
+ ),
+ 5 => array(
+ 'title' => 'empty',
+ 'operator' => 'empty',
+ 'value' => array(),
+ ),
+ 6 => array(
+ 'title' => 'not empty',
+ 'operator' => 'not empty',
+ 'value' => array(),
+ ),
+ );
+ return $view;
+ }
+
+ /**
+ * Generates test_tid_exposed_grouped_options view.
+ */
+ protected function getTermIdExposedGroupedOptionsTestView() {
+ $view = new view();
+ $view->name = 'test_tid_exposed_grouped_options';
+ $view->description = '';
+ $view->tag = 'default';
+ $view->base_table = 'node';
+ $view->human_name = 'test_tid_exposed_grouped_options';
+ $view->core = 7;
+ $view->api_version = '3.0';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+ /* Display: Master */
+ $handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['use_more_always'] = FALSE;
+ $handler->display->display_options['access']['type'] = 'perm';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'full';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'fields';
+ /* Field: Content: Title */
+ $handler->display->display_options['fields']['title']['id'] = 'title';
+ $handler->display->display_options['fields']['title']['table'] = 'node';
+ $handler->display->display_options['fields']['title']['field'] = 'title';
+ $handler->display->display_options['fields']['title']['label'] = '';
+ $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+ $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+ /* Sort criterion: Content: Nid */
+ $handler->display->display_options['sorts']['nid']['id'] = 'nid';
+ $handler->display->display_options['sorts']['nid']['table'] = 'node';
+ $handler->display->display_options['sorts']['nid']['field'] = 'nid';
+ /* Filter criterion: Content: Published */
+ $handler->display->display_options['filters']['status']['id'] = 'status';
+ $handler->display->display_options['filters']['status']['table'] = 'node';
+ $handler->display->display_options['filters']['status']['field'] = 'status';
+ $handler->display->display_options['filters']['status']['value'] = 1;
+ $handler->display->display_options['filters']['status']['group'] = 1;
+ $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+ /* Filter criterion: Content: Tags (field_tags) */
+ $handler->display->display_options['filters']['field_tags_tid']['id'] = 'field_tags_tid';
+ $handler->display->display_options['filters']['field_tags_tid']['table'] = 'field_data_field_tags';
+ $handler->display->display_options['filters']['field_tags_tid']['field'] = 'field_tags_tid';
+ $handler->display->display_options['filters']['field_tags_tid']['value'] = array(
+ 1 => '1',
+ 2 => '2',
+ );
+ $handler->display->display_options['filters']['field_tags_tid']['exposed'] = TRUE;
+ $handler->display->display_options['filters']['field_tags_tid']['expose']['operator_id'] = 'field_tags_tid_op';
+ $handler->display->display_options['filters']['field_tags_tid']['expose']['label'] = 'Tags (field_tags)';
+ $handler->display->display_options['filters']['field_tags_tid']['expose']['operator'] = 'field_tags_tid_op';
+ $handler->display->display_options['filters']['field_tags_tid']['expose']['identifier'] = 'field_tags_tid';
+ $handler->display->display_options['filters']['field_tags_tid']['expose']['remember_roles'] = array(
+ 2 => '2',
+ );
+ $handler->display->display_options['filters']['field_tags_tid']['is_grouped'] = TRUE;
+ $handler->display->display_options['filters']['field_tags_tid']['group_info']['label'] = 'Tags (field_tags)';
+ $handler->display->display_options['filters']['field_tags_tid']['group_info']['identifier'] = 'field_tags_tid';
+ $handler->display->display_options['filters']['field_tags_tid']['group_info']['group_items'] = array(
+ 1 => array(
+ 'title' => 'Is none of 2',
+ 'operator' => 'not',
+ 'value' => array(
+ 2 => '2',
+ ),
+ ),
+ 2 => array(
+ 'title' => 'Is none of 1 or 2',
+ 'operator' => 'not',
+ 'value' => array(
+ 1 => '1',
+ 2 => '2',
+ ),
+ ),
+ 3 => array(
+ 'title' => 'Is one of 1',
+ 'operator' => 'or',
+ 'value' => array(
+ 1 => '1',
+ ),
+ ),
+ 4 => array(
+ 'title' => 'Is one of 1 or 2',
+ 'operator' => 'or',
+ 'value' => array(
+ 1 => '1',
+ 2 => '2',
+ ),
+ ),
+ 5 => array(
+ 'title' => 'Is all of 1 and 2',
+ 'operator' => 'and',
+ 'value' => array(
+ 1 => '1',
+ 2 => '2',
+ ),
+ ),
+ 6 => array(
+ 'title' => 'Is empty',
+ 'operator' => 'empty',
+ 'value' => array(
+ 1 => '1',
+ 2 => '2',
+ ),
+ ),
+ 7 => array(
+ 'title' => 'Is not empty',
+ 'operator' => 'not empty',
+ 'value' => array(
+ 1 => '1',
+ 2 => '2',
+ ),
+ ),
+ );
+ $handler->display->display_options['filters']['field_tags_tid']['type'] = 'select';
+ $handler->display->display_options['filters']['field_tags_tid']['vocabulary'] = 'tags';
+ return $view;
+ }
+
+ /**
+ * Generates test_join_limit_none_of view.
+ */
+ protected function getJoinLimitNoneOfTestView() {
+ $view = new view();
+ $view->name = 'test_join_limit_none_of';
+ $view->description = '';
+ $view->tag = 'default';
+ $view->base_table = 'node';
+ $view->human_name = 'test_join_limit_none_of';
+ $view->core = 7;
+ $view->api_version = '3.0';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+ /* Display: Master */
+ $handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['use_more_always'] = FALSE;
+ $handler->display->display_options['access']['type'] = 'perm';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'full';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'fields';
+ /* Field: Content: Title */
+ $handler->display->display_options['fields']['title']['id'] = 'title';
+ $handler->display->display_options['fields']['title']['table'] = 'node';
+ $handler->display->display_options['fields']['title']['field'] = 'title';
+ $handler->display->display_options['fields']['title']['label'] = '';
+ $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+ $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+ /* Sort criterion: Content: Post date */
+ $handler->display->display_options['sorts']['created']['id'] = 'created';
+ $handler->display->display_options['sorts']['created']['table'] = 'node';
+ $handler->display->display_options['sorts']['created']['field'] = 'created';
+ $handler->display->display_options['sorts']['created']['order'] = 'DESC';
+ /* Filter criterion: Content: Published */
+ $handler->display->display_options['filters']['status']['id'] = 'status';
+ $handler->display->display_options['filters']['status']['table'] = 'node';
+ $handler->display->display_options['filters']['status']['field'] = 'status';
+ $handler->display->display_options['filters']['status']['value'] = 1;
+ $handler->display->display_options['filters']['status']['group'] = 1;
+ $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+ /* Filter criterion: Content: Tags (field_tags) */
+ $handler->display->display_options['filters']['field_tags_tid']['id'] = 'field_tags_tid';
+ $handler->display->display_options['filters']['field_tags_tid']['table'] = 'field_data_field_tags';
+ $handler->display->display_options['filters']['field_tags_tid']['field'] = 'field_tags_tid';
+ $handler->display->display_options['filters']['field_tags_tid']['operator'] = 'not';
+ $handler->display->display_options['filters']['field_tags_tid']['value'] = array(
+ 2 => '2',
+ 3 => '3',
+ 4 => '4',
+ 5 => '5',
+ 6 => '6',
+ 7 => '7',
+ 8 => '8',
+ 9 => '9',
+ 10 => '10',
+ 11 => '11',
+ 12 => '12',
+ 13 => '13',
+ 14 => '14',
+ 15 => '15',
+ 16 => '16',
+ 17 => '17',
+ 18 => '18',
+ 19 => '19',
+ 20 => '20',
+ 21 => '21',
+ 22 => '22',
+ 23 => '23',
+ 24 => '24',
+ 25 => '25',
+ 26 => '26',
+ 27 => '27',
+ 28 => '28',
+ 29 => '29',
+ 30 => '30',
+ 31 => '31',
+ 32 => '32',
+ 33 => '33',
+ 34 => '34',
+ 35 => '35',
+ 36 => '36',
+ 37 => '37',
+ 38 => '38',
+ 39 => '39',
+ 40 => '40',
+ 41 => '41',
+ 42 => '42',
+ 43 => '43',
+ 44 => '44',
+ 45 => '45',
+ 46 => '46',
+ 47 => '47',
+ 48 => '48',
+ 49 => '49',
+ 50 => '50',
+ 51 => '51',
+ 52 => '52',
+ 53 => '53',
+ 54 => '54',
+ 55 => '55',
+ 56 => '56',
+ 57 => '57',
+ 58 => '58',
+ 59 => '59',
+ 60 => '60',
+ 61 => '61',
+ 62 => '62',
+ 63 => '63',
+ 64 => '64',
+ 65 => '65',
+ 66 => '66',
+ 67 => '67',
+ 68 => '68',
+ 69 => '69',
+ 61 => '61',
+ 62 => '62',
+ );
+ $handler->display->display_options['filters']['field_tags_tid']['type'] = 'select';
+ $handler->display->display_options['filters']['field_tags_tid']['vocabulary'] = 'tags';
+ return $view;
+ }
+
+}
diff --git a/sites/all/modules/contrib/views/views/tests/styles/views_plugin_style.test b/sites/all/modules/contrib/views/views/tests/styles/views_plugin_style.test
index 20a24eb9..89d2816c 100644
--- a/sites/all/modules/contrib/views/views/tests/styles/views_plugin_style.test
+++ b/sites/all/modules/contrib/views/views/tests/styles/views_plugin_style.test
@@ -78,6 +78,7 @@ class ViewsPluginStyleTestCase extends ViewsPluginStyleTestBase {
$expected = array();
$expected['Job: Singer'] = array();
$expected['Job: Singer']['group'] = 'Job: Singer';
+ $expected['Job: Singer']['level'] = '0';
$expected['Job: Singer']['rows'][0] = new StdClass();
$expected['Job: Singer']['rows'][0]->views_test_name = 'John';
$expected['Job: Singer']['rows'][0]->views_test_job = 'Singer';
@@ -88,6 +89,7 @@ class ViewsPluginStyleTestCase extends ViewsPluginStyleTestBase {
$expected['Job: Singer']['rows'][1]->views_test_id = '2';
$expected['Job: Drummer'] = array();
$expected['Job: Drummer']['group'] = 'Job: Drummer';
+ $expected['Job: Drummer']['level'] = '0';
$expected['Job: Drummer']['rows'][2] = new StdClass();
$expected['Job: Drummer']['rows'][2]->views_test_name = 'Ringo';
$expected['Job: Drummer']['rows'][2]->views_test_job = 'Drummer';
@@ -161,8 +163,10 @@ class ViewsPluginStyleTestCase extends ViewsPluginStyleTestBase {
$expected = array();
$expected['Job: Singer'] = array();
$expected['Job: Singer']['group'] = 'Job: Singer';
+ $expected['Job: Singer']['level'] = 0;
$expected['Job: Singer']['rows']['Age: 25'] = array();
$expected['Job: Singer']['rows']['Age: 25']['group'] = 'Age: 25';
+ $expected['Job: Singer']['rows']['Age: 25']['level'] = 1;
$expected['Job: Singer']['rows']['Age: 25']['rows'][0] = new StdClass();
$expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_name = 'John';
$expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_job = 'Singer';
@@ -170,6 +174,7 @@ class ViewsPluginStyleTestCase extends ViewsPluginStyleTestBase {
$expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_id = '1';
$expected['Job: Singer']['rows']['Age: 27'] = array();
$expected['Job: Singer']['rows']['Age: 27']['group'] = 'Age: 27';
+ $expected['Job: Singer']['rows']['Age: 27']['level'] = 1;
$expected['Job: Singer']['rows']['Age: 27']['rows'][1] = new StdClass();
$expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_name = 'George';
$expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_job = 'Singer';
@@ -177,8 +182,10 @@ class ViewsPluginStyleTestCase extends ViewsPluginStyleTestBase {
$expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_id = '2';
$expected['Job: Drummer'] = array();
$expected['Job: Drummer']['group'] = 'Job: Drummer';
+ $expected['Job: Drummer']['level'] = 0;
$expected['Job: Drummer']['rows']['Age: 28'] = array();
$expected['Job: Drummer']['rows']['Age: 28']['group'] = 'Age: 28';
+ $expected['Job: Drummer']['rows']['Age: 28']['level'] = 1;
$expected['Job: Drummer']['rows']['Age: 28']['rows'][2] = new StdClass();
$expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_name = 'Ringo';
$expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_job = 'Drummer';
diff --git a/sites/all/modules/contrib/views/views/tests/user/views_handler_field_user_name.test b/sites/all/modules/contrib/views/views/tests/user/views_handler_field_user_name.test
index 60ec3b25..73a8ac11 100644
--- a/sites/all/modules/contrib/views/views/tests/user/views_handler_field_user_name.test
+++ b/sites/all/modules/contrib/views/views/tests/user/views_handler_field_user_name.test
@@ -51,6 +51,23 @@ class viewsHandlerFieldUserNameTest extends ViewsSqlTest {
$this->assertIdentical($render, $anon_name, 'For user0 it should use the configured anonymous text if overwrite_anonymous is checked.');
}
+
+ /**
+ * Tests that deselecting 'link_to_user' and 'format_username' works.
+ */
+ public function testOptions() {
+ $view = $this->view_raw_user_name();
+ $view->init_display();
+ $this->executeView($view);
+
+ $view->row_index = 0;
+
+ $username = $view->result[0]->users_name = 'test';
+ $view->result[0]->uid = 1;
+ $render = $view->field['name']->advanced_render($view->result[0]);
+ $this->assertTrue(strpos($render, $username) !== FALSE, 'If link to user is checked the username should be part of the output.');
+ }
+
function view_user_name() {
$view = new view();
$view->name = 'test_views_handler_field_user_name';
@@ -93,4 +110,46 @@ class viewsHandlerFieldUserNameTest extends ViewsSqlTest {
return $view;
}
+ function view_raw_user_name() {
+ $view = new view;
+ $view->name = 'test_views_handler_field_user_name';
+ $view->description = '';
+ $view->tag = 'default';
+ $view->base_table = 'users';
+ $view->human_name = 'test_views_handler_field_user_name';
+ $view->core = 7;
+ $view->api_version = '3.0';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+ /* Display: Master */
+ $handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['access']['type'] = 'none';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['query']['options']['query_comment'] = FALSE;
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'full';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'fields';
+ /* Field: User: Name */
+ $handler->display->display_options['fields']['name']['id'] = 'name';
+ $handler->display->display_options['fields']['name']['table'] = 'users';
+ $handler->display->display_options['fields']['name']['field'] = 'name';
+ $handler->display->display_options['fields']['name']['label'] = '';
+ $handler->display->display_options['fields']['name']['alter']['alter_text'] = 0;
+ $handler->display->display_options['fields']['name']['alter']['make_link'] = 0;
+ $handler->display->display_options['fields']['name']['alter']['absolute'] = 0;
+ $handler->display->display_options['fields']['name']['alter']['word_boundary'] = 0;
+ $handler->display->display_options['fields']['name']['alter']['ellipsis'] = 0;
+ $handler->display->display_options['fields']['name']['alter']['strip_tags'] = 0;
+ $handler->display->display_options['fields']['name']['alter']['trim'] = 0;
+ $handler->display->display_options['fields']['name']['alter']['html'] = 0;
+ $handler->display->display_options['fields']['name']['hide_empty'] = 0;
+ $handler->display->display_options['fields']['name']['empty_zero'] = 0;
+ $handler->display->display_options['fields']['name']['link_to_user'] = 0;
+ $handler->display->display_options['fields']['name']['format_username'] = 0;
+ $handler->display->display_options['fields']['name']['overwrite_anonymous'] = 0;
+
+ return $view;
+ }
}
diff --git a/sites/all/modules/contrib/views/views/tests/views_clone.test b/sites/all/modules/contrib/views/views/tests/views_clone.test
new file mode 100644
index 00000000..7ac10aba
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/tests/views_clone.test
@@ -0,0 +1,277 @@
+ 'Test cloning a view',
+ 'description' => 'Tests clone_view method of views class',
+ 'group' => 'Views',
+ );
+ }
+
+ /**
+ * Returns a new term with random properties in vocabulary $vocabulary.
+ */
+ protected function createTerm($vocabulary) {
+ $term = new stdClass();
+ $term->name = $this->randomName();
+ $term->description = $this->randomName();
+ // Use the first available text format.
+ $term->format = db_query_range('SELECT format FROM {filter_format}', 0, 1)->fetchField();
+ $term->vid = $vocabulary->vid;
+ taxonomy_term_save($term);
+ return $term;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setUp() {
+ parent::setUp();
+
+ $vocabulary = taxonomy_vocabulary_machine_name_load('tags');
+ $this->term = $this->createTerm($vocabulary);
+
+ $node = array();
+ $node['type'] = 'article';
+ $node['field_tags'][LANGUAGE_NONE][]['tid'] = $this->term->tid;
+ $this->node = $this->drupalCreateNode($node);
+ }
+
+ /**
+ * Test cloning a view.
+ */
+ public function testClone() {
+ // Prepare view to be cloned.
+ $view = $this->getTestCloneView();
+ $view->set_arguments(array(
+ 0 => $this->node->nid,
+ ));
+ $view->set_exposed_input(array(
+ 'field_tags_tid' => $this->term->tid,
+ ));
+
+ // Execute view to be cloned.
+ $result = $view->execute();
+
+ // To make sure that we are properly testing removal of all properties, we
+ // first need to assert that they are actually present in the original view.
+ $keys = array(
+ 'current_display',
+ 'display_handler',
+ 'field',
+ 'argument',
+ 'filter',
+ 'sort',
+ 'relationship',
+ 'header',
+ 'footer',
+ 'empty',
+ 'query',
+ 'inited',
+ 'style_plugin',
+ 'plugin_name',
+ 'exposed_data',
+ 'exposed_input',
+ 'exposed_widgets',
+ 'many_to_one_aliases',
+ 'many_to_one_tables',
+ 'feed_icon',
+ );
+ foreach ($keys as $key) {
+ $this->assertTrue(isset($view->{$key}), $key . 'is set in original view.');
+ }
+ $this->assertTrue($view->built, 'Assert original view built.');
+ $this->assertTrue($view->executed, 'Assert original view executed.');
+ $this->assertNotEqual($view->build_info, array(), 'Assert original view has build_info.');
+ $this->assertNotEqual($view->attachment_before, '', 'Assert original view has attachment_before.');
+ $this->assertNotEqual($view->attachment_after, '', 'Assert original view has attachment_after.');
+ $this->assertNotEqual($view->result, array(), 'Assert original view has result.');
+
+ // Clone view.
+ $clone = $view->clone_view();
+
+ // Assert that all relevant properties have been removed or reset.
+ $keys = array(
+ 'current_display',
+ 'display_handler',
+ 'field',
+ 'argument',
+ 'filter',
+ 'sort',
+ 'relationship',
+ 'header',
+ 'footer',
+ 'empty',
+ 'query',
+ 'inited',
+ 'style_plugin',
+ 'plugin_name',
+ 'exposed_data',
+ 'exposed_input',
+ 'exposed_widgets',
+ 'many_to_one_aliases',
+ 'many_to_one_tables',
+ 'feed_icon',
+ );
+ foreach ($keys as $key) {
+ $this->assertFalse(isset($clone->{$key}), $key . ' has been removed in cloned view.');
+ }
+ foreach ($clone->display as $id => $display) {
+ $this->assertFalse(isset($clone->display[$id]->handler), 'Make sure all display handlers have been destroyed.');
+ }
+ $this->assertFalse($clone->built, 'Assert cloned view not built.');
+ $this->assertFalse($clone->executed, 'Assert cloned view not executed.');
+ $this->assertEqual($clone->build_info, array(), 'Assert cloned view has empty build_info.');
+ $this->assertEqual($clone->attachment_before, '', 'Assert cloned view has empty attachment_before.');
+ $this->assertEqual($clone->attachment_after, '', 'Assert cloned view has empty attachment_after.');
+ $this->assertEqual($clone->result, array(), 'Assert cloned view has empty result.');
+
+ // Execute cloned view.
+ $clone->execute();
+
+ // Assert result sets are equal.
+ $this->assertEqual($view->result, $clone->result, 'Result sets of cloned view and original view match.');
+ }
+
+ /**
+ * Generate test_clone view.
+ */
+ protected function getTestCloneView() {
+ $view = new view();
+ $view->name = 'test_clone';
+ $view->description = '';
+ $view->tag = 'default';
+ $view->base_table = 'node';
+ $view->human_name = 'test_clone';
+ $view->core = 7;
+ $view->api_version = '3.0';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+ /* Display: Master */
+ $handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['title'] = 'test_clone';
+ $handler->display->display_options['use_more_always'] = FALSE;
+ $handler->display->display_options['access']['type'] = 'perm';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'full';
+ $handler->display->display_options['pager']['options']['items_per_page'] = '10';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'node';
+ /* Header: Global: Text area */
+ $handler->display->display_options['header']['area']['id'] = 'area';
+ $handler->display->display_options['header']['area']['table'] = 'views';
+ $handler->display->display_options['header']['area']['field'] = 'area';
+ $handler->display->display_options['header']['area']['label'] = 'Header';
+ $handler->display->display_options['header']['area']['content'] = 'Header';
+ $handler->display->display_options['header']['area']['format'] = 'filtered_html';
+ /* Footer: Global: Text area */
+ $handler->display->display_options['footer']['area']['id'] = 'area';
+ $handler->display->display_options['footer']['area']['table'] = 'views';
+ $handler->display->display_options['footer']['area']['field'] = 'area';
+ $handler->display->display_options['footer']['area']['label'] = 'Footer';
+ $handler->display->display_options['footer']['area']['content'] = 'Footer';
+ $handler->display->display_options['footer']['area']['format'] = 'filtered_html';
+ /* No results behavior: Global: Text area */
+ $handler->display->display_options['empty']['area']['id'] = 'area';
+ $handler->display->display_options['empty']['area']['table'] = 'views';
+ $handler->display->display_options['empty']['area']['field'] = 'area';
+ $handler->display->display_options['empty']['area']['label'] = 'Empty';
+ $handler->display->display_options['empty']['area']['empty'] = TRUE;
+ $handler->display->display_options['empty']['area']['content'] = 'Empty';
+ $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
+ /* Relationship: Comment: Last Comment */
+ $handler->display->display_options['relationships']['cid']['id'] = 'cid';
+ $handler->display->display_options['relationships']['cid']['table'] = 'node_comment_statistics';
+ $handler->display->display_options['relationships']['cid']['field'] = 'cid';
+ /* Field: Content: Title */
+ $handler->display->display_options['fields']['title']['id'] = 'title';
+ $handler->display->display_options['fields']['title']['table'] = 'node';
+ $handler->display->display_options['fields']['title']['field'] = 'title';
+ $handler->display->display_options['fields']['title']['label'] = '';
+ $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+ $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+ /* Sort criterion: Content: Post date */
+ $handler->display->display_options['sorts']['created']['id'] = 'created';
+ $handler->display->display_options['sorts']['created']['table'] = 'node';
+ $handler->display->display_options['sorts']['created']['field'] = 'created';
+ $handler->display->display_options['sorts']['created']['order'] = 'DESC';
+ /* Contextual filter: Content: Nid */
+ $handler->display->display_options['arguments']['nid']['id'] = 'nid';
+ $handler->display->display_options['arguments']['nid']['table'] = 'node';
+ $handler->display->display_options['arguments']['nid']['field'] = 'nid';
+ $handler->display->display_options['arguments']['nid']['default_argument_type'] = 'fixed';
+ $handler->display->display_options['arguments']['nid']['summary']['number_of_records'] = '0';
+ $handler->display->display_options['arguments']['nid']['summary']['format'] = 'default_summary';
+ $handler->display->display_options['arguments']['nid']['summary_options']['items_per_page'] = '25';
+ /* Filter criterion: Content: Published */
+ $handler->display->display_options['filters']['status']['id'] = 'status';
+ $handler->display->display_options['filters']['status']['table'] = 'node';
+ $handler->display->display_options['filters']['status']['field'] = 'status';
+ $handler->display->display_options['filters']['status']['value'] = 'All';
+ $handler->display->display_options['filters']['status']['group'] = 1;
+ $handler->display->display_options['filters']['status']['exposed'] = TRUE;
+ $handler->display->display_options['filters']['status']['expose']['operator_id'] = '';
+ $handler->display->display_options['filters']['status']['expose']['label'] = 'Published';
+ $handler->display->display_options['filters']['status']['expose']['operator'] = 'status_op';
+ $handler->display->display_options['filters']['status']['expose']['identifier'] = 'status';
+ $handler->display->display_options['filters']['status']['expose']['remember_roles'] = array(
+ 2 => '2',
+ );
+ /* Filter criterion: Content: Tags (field_tags) */
+ $handler->display->display_options['filters']['field_tags_tid']['id'] = 'field_tags_tid';
+ $handler->display->display_options['filters']['field_tags_tid']['table'] = 'field_data_field_tags';
+ $handler->display->display_options['filters']['field_tags_tid']['field'] = 'field_tags_tid';
+ $handler->display->display_options['filters']['field_tags_tid']['exposed'] = TRUE;
+ $handler->display->display_options['filters']['field_tags_tid']['expose']['operator_id'] = 'field_tags_tid_op';
+ $handler->display->display_options['filters']['field_tags_tid']['expose']['label'] = 'Tags (field_tags)';
+ $handler->display->display_options['filters']['field_tags_tid']['expose']['operator'] = 'field_tags_tid_op';
+ $handler->display->display_options['filters']['field_tags_tid']['expose']['identifier'] = 'field_tags_tid';
+ $handler->display->display_options['filters']['field_tags_tid']['expose']['remember_roles'] = array(
+ 2 => '2',
+ );
+ $handler->display->display_options['filters']['field_tags_tid']['reduce_duplicates'] = TRUE;
+ $handler->display->display_options['filters']['field_tags_tid']['type'] = 'select';
+ $handler->display->display_options['filters']['field_tags_tid']['vocabulary'] = 'tags';
+ /* Display: Page */
+ $handler = $view->new_display('page', 'Page', 'page');
+ $handler->display->display_options['path'] = 'test-clone';
+ /* Display: attachment_before */
+ $handler = $view->new_display('attachment', 'attachment_before', 'attachment_1');
+ $handler->display->display_options['pager']['type'] = 'some';
+ $handler->display->display_options['displays'] = array(
+ 'default' => 'default',
+ 'page' => 'page',
+ );
+ $handler->display->display_options['inherit_exposed_filters'] = TRUE;
+ /* Display: attachment_after */
+ $handler = $view->new_display('attachment', 'attachment_after', 'attachment_2');
+ $handler->display->display_options['pager']['type'] = 'some';
+ $handler->display->display_options['displays'] = array(
+ 'default' => 'default',
+ 'page' => 'page',
+ );
+ $handler->display->display_options['attachment_position'] = 'after';
+ $handler->display->display_options['inherit_exposed_filters'] = TRUE;
+ /* Display: Feed */
+ $handler = $view->new_display('feed', 'Feed', 'feed_1');
+ $handler->display->display_options['pager']['type'] = 'some';
+ $handler->display->display_options['style_plugin'] = 'rss';
+ $handler->display->display_options['row_plugin'] = 'node_rss';
+ $handler->display->display_options['path'] = 'test_clone/rss';
+ $handler->display->display_options['displays'] = array(
+ 'default' => 'default',
+ 'page' => 'page',
+ );
+ return $view;
+ }
+
+}
diff --git a/sites/all/modules/contrib/views/views/tests/views_query.test b/sites/all/modules/contrib/views/views/tests/views_query.test
index 5acf01e9..ed10f3be 100644
--- a/sites/all/modules/contrib/views/views/tests/views_query.test
+++ b/sites/all/modules/contrib/views/views/tests/views_query.test
@@ -152,6 +152,23 @@ abstract class ViewsTestCase extends DrupalWebTestCase {
$this->drupalLogin($account);
}
+ /**
+ * {@inheritdoc}
+ */
+ protected function verbose($message, $title = NULL) {
+ // Handle arrays, objects, etc.
+ if (!is_string($message)) {
+ $message = "
\n" . print_r($message, TRUE) . "\n
\n";
+ }
+
+ // Optional title to go before the output.
+ if (!empty($title)) {
+ $title = '
' . check_plain($title) . "
\n";
+ }
+
+ parent::verbose($title . $message);
+ }
+
}
/**
diff --git a/sites/all/modules/contrib/views/views/tests/views_test.info b/sites/all/modules/contrib/views/views/tests/views_test.info
index 5095b7f2..d7e79211 100644
--- a/sites/all/modules/contrib/views/views/tests/views_test.info
+++ b/sites/all/modules/contrib/views/views/tests/views_test.info
@@ -5,8 +5,8 @@ core = 7.x
dependencies[] = views
hidden = TRUE
-; Information added by Drupal.org packaging script on 2019-04-03
-version = "7.x-3.22"
+; Information added by Drupal.org packaging script on 2019-05-10
+version = "7.x-3.23"
core = "7.x"
project = "views"
-datestamp = "1554307093"
+datestamp = "1557505389"
diff --git a/sites/all/modules/contrib/views/views/theme/theme.inc b/sites/all/modules/contrib/views/views/theme/theme.inc
index 7382f01d..99b8efe7 100644
--- a/sites/all/modules/contrib/views/views/theme/theme.inc
+++ b/sites/all/modules/contrib/views/views/theme/theme.inc
@@ -379,8 +379,10 @@ function template_preprocess_views_view_summary(&$vars) {
$active_urls = drupal_map_assoc(array(
// Force system path.
url($_GET['q'], array('alias' => TRUE)),
+ url($_GET['q'], $url_options + array('alias' => TRUE)),
// Could be an alias.
url($_GET['q']),
+ url($_GET['q'], $url_options),
));
// Collect all arguments foreach row, to be able to alter them for example by
@@ -430,8 +432,10 @@ function template_preprocess_views_view_summary_unformatted(&$vars) {
$active_urls = drupal_map_assoc(array(
// Force system path.
url($_GET['q'], array('alias' => TRUE)),
+ url($_GET['q'], $url_options + array('alias' => TRUE)),
// Could be an alias.
url($_GET['q']),
+ url($_GET['q'], $url_options),
));
// Collect all arguments foreach row, to be able to alter them for example by
@@ -479,9 +483,24 @@ function template_preprocess_views_view_table(&$vars) {
$vars['rows'] = array();
$vars['field_classes'] = array();
$vars['header'] = array();
+ $vars['classes_array'] = array();
$options = $view->style_plugin->options;
$handler = $view->style_plugin;
+
+ if (!empty($handler->options['class'])) {
+ $classes = explode(' ', $handler->options['class']);
+ $classes = array_map('views_clean_css_identifier', $classes);
+
+ if (!empty($classes)) {
+ // Trim empty class entries.
+ foreach ($classes as $key => $class) {
+ if (!empty($class)) {
+ $vars['classes_array'][] = $class;
+ }
+ }
+ }
+ }
$default_row_class = isset($options['default_row_class']) ? $options['default_row_class'] : TRUE;
$row_class_special = isset($options['row_class_special']) ? $options['row_class_special'] : TRUE;
@@ -647,7 +666,7 @@ function template_preprocess_views_view_table(&$vars) {
$vars['row_classes'][count($vars['row_classes']) - 1][] = 'views-row-last';
}
- $vars['classes_array'] = array('views-table');
+ $vars['classes_array'][] = 'views-table';
if (empty($vars['rows']) && !empty($options['empty_table'])) {
$vars['rows'][0][0] = $view->display_handler->render_area('empty');
// Calculate the amounts of rows with output.
@@ -710,7 +729,7 @@ function template_preprocess_views_view_grid(&$vars) {
}
if ($row) {
// Fill up the last line only if it's configured, but this is default.
- if (!empty($handler->options['fill_single_line']) && count($rows)) {
+ if (!empty($handler->options['fill_single_line'])) {
for ($i = 0; $i < ($columns - $col_count); $i++) {
$row[] = '';
}
@@ -739,8 +758,15 @@ function template_preprocess_views_view_grid(&$vars) {
$remainders--;
}
}
- for ($i = 0; $i < count($rows[0]); $i++) {
- // This should be string so that's okay :)
+
+ // Fill out the row with empty values, if needed.
+ if (!empty($handler->options['fill_single_line'])) {
+ $column_fill = $columns;
+ }
+ else {
+ $column_fill = count($rows[0]);
+ }
+ for ($i = 0; $i < $column_fill; $i++) {
if (!isset($rows[count($rows) - 1][$i])) {
$rows[count($rows) - 1][$i] = '';
}
diff --git a/sites/all/modules/contrib/views/views/theme/views-ui-edit-view.tpl.php b/sites/all/modules/contrib/views/views/theme/views-ui-edit-view.tpl.php
deleted file mode 100644
index f4333324..00000000
--- a/sites/all/modules/contrib/views/views/theme/views-ui-edit-view.tpl.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
- break this lock.',
- array('!user' => $locked, '!age' => $lock_age, '!break' => $break)); ?>
-
-
-
- vid)): ?>
-
-
-
-
-
-
-
- @base.',
- array('%name' => $view->name, '@base' => $base_table)); ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sites/all/modules/contrib/views/views/views.api.php b/sites/all/modules/contrib/views/views/views.api.php
index ea53a37c..dcf80195 100644
--- a/sites/all/modules/contrib/views/views/views.api.php
+++ b/sites/all/modules/contrib/views/views/views.api.php
@@ -752,7 +752,7 @@ function hook_views_plugin_option_definition_alter(&$options, $plugin) {
* Alter existing handler option definitions.
*
* This can be used to edit default or add new option definitions to existing
- * handers. The reason for doing this is that only overriding the relevent form
+ * handlers. The reason for doing this is that only overriding the relevent form
* with hook_form_alter() is insufficent because submitted form values will be
* ignored if they haven't been declared as an available option.
*
@@ -787,7 +787,7 @@ function hook_views_handler_option_definition_alter(&$options, $handler) {
* - api: (required) The version of the Views API the module implements.
* - path: (optional) If includes are stored somewhere other than within the
* root module directory, specify its path here.
- * - template path: (optional) A path where the module has stored it's views
+ * - template path: (optional) A path where the module has stored its views
* template files. When you have specified this key views automatically
* uses the template files for the views. You can use the same naming
* conventions like for normal views template files.
diff --git a/sites/all/modules/contrib/views/views/views.info b/sites/all/modules/contrib/views/views/views.info
index d9d1c116..a857b233 100644
--- a/sites/all/modules/contrib/views/views/views.info
+++ b/sites/all/modules/contrib/views/views/views.info
@@ -285,6 +285,7 @@ files[] = tests/handlers/views_handler_filter_equality.test
files[] = tests/handlers/views_handler_filter_in_operator.test
files[] = tests/handlers/views_handler_filter_numeric.test
files[] = tests/handlers/views_handler_filter_string.test
+files[] = tests/handlers/views_handler_manytoone.test
files[] = tests/handlers/views_handler_sort_random.test
files[] = tests/handlers/views_handler_sort_date.test
files[] = tests/handlers/views_handler_sort.test
@@ -326,11 +327,12 @@ files[] = tests/user/views_user_argument_default.test
files[] = tests/user/views_user_argument_validate.test
files[] = tests/user/views_user.test
files[] = tests/views_cache.test
+files[] = tests/views_clone.test
files[] = tests/views_view.test
files[] = tests/views_ui.test
-; Information added by Drupal.org packaging script on 2019-04-03
-version = "7.x-3.22"
+; Information added by Drupal.org packaging script on 2019-05-10
+version = "7.x-3.23"
core = "7.x"
project = "views"
-datestamp = "1554307093"
+datestamp = "1557505389"
diff --git a/sites/all/modules/contrib/views/views/views.module b/sites/all/modules/contrib/views/views/views.module
index 58cfed4f..aa407f02 100644
--- a/sites/all/modules/contrib/views/views/views.module
+++ b/sites/all/modules/contrib/views/views/views.module
@@ -752,6 +752,65 @@ function views_block_info() {
return $items;
}
+/**
+ * Implements hook_block_configure().
+ */
+function views_block_configure($delta = '') {
+ // If there's no Views UI module there's nothing to link to.
+ if (!module_exists('views_ui')) {
+ return array();
+ }
+
+ // If the user doesn't have access to edit the view then don't bother with
+ // anything else.
+ if (!user_access('administer views')) {
+ return array();
+ }
+
+ // If this is 32, this should be an md5 hash.
+ if (strlen($delta) == 32) {
+ $hashes = variable_get('views_block_hashes', array());
+ if (!empty($hashes[$delta])) {
+ $delta = $hashes[$delta];
+ }
+ }
+
+ // Some added precaution in case the delta is missing values.
+ list($view_name, $display_id) = explode('-', $delta, 2) + array('', '');
+
+ // If the view name or display ID can't be found, there's something wrong.
+ if ($view_name === '' || $display_id === '') {
+ return array();
+ }
+
+ $view = views_get_view($view_name);
+ if (empty($view)) {
+ return array();
+ }
+
+ if (!isset($view->display[$display_id])) {
+ return array();
+ }
+
+ /** @var \views_display $display */
+ $display = $view->display[$display_id];
+
+ $view_label = $view->get_human_name();
+ $display_label = $display->display_title;
+
+ $path = "admin/structure/views/view/$view_name/edit/$display_id";
+
+ return array(
+ 'fieldset' => array(
+ '#type' => 'fieldset',
+ '#title' => t('Configure this views display'),
+ 'content' => array(
+ '#markup' => l($view_label . ' - ' . $display_label, $path),
+ ),
+ ),
+ );
+}
+
/**
* Implements hook_block_view().
*/
@@ -1231,7 +1290,7 @@ function views_add_css($file) {
* Include views .js files.
*/
function views_add_js($file) {
- // If javascript has been disabled by the user, never add js files.
+ // If JavaScript has been disabled by the user, never add js files.
if (variable_get('views_no_javascript', FALSE)) {
return;
}
@@ -2586,6 +2645,17 @@ function views_views_api() {
);
}
+/**
+ * Implements hook_admin_menu_cache_info().
+ */
+function views_admin_menu_cache_info() {
+ $caches['views'] = array(
+ 'title' => t('Views'),
+ 'callback' => 'views_invalidate_cache',
+ );
+ return $caches;
+}
+
if (!function_exists('aggregator_views_api')) {
/**
* Provide Views integration for the Aggregator module.
diff --git a/sites/all/modules/contrib/views/views/views_ui.info b/sites/all/modules/contrib/views/views/views_ui.info
index 3053db91..7a8e5383 100644
--- a/sites/all/modules/contrib/views/views/views_ui.info
+++ b/sites/all/modules/contrib/views/views/views_ui.info
@@ -8,8 +8,8 @@ dependencies[] = views
files[] = views_ui.module
files[] = plugins/views_wizard/views_ui_base_views_wizard.class.php
-; Information added by Drupal.org packaging script on 2019-04-03
-version = "7.x-3.22"
+; Information added by Drupal.org packaging script on 2019-05-10
+version = "7.x-3.23"
core = "7.x"
project = "views"
-datestamp = "1554307093"
+datestamp = "1557505389"
diff --git a/sites/all/modules/contrib/views/views/views_ui.module b/sites/all/modules/contrib/views/views/views_ui.module
index 387e6697..0eadd6ff 100644
--- a/sites/all/modules/contrib/views/views/views_ui.module
+++ b/sites/all/modules/contrib/views/views/views_ui.module
@@ -804,6 +804,9 @@ function views_ui_contextual_links_suppress_pop() {
* @see http://drupal.org/node/774876
*/
function views_ui_ajax_get_form($form_id) {
+ $args = func_get_args();
+ array_shift($args);
+
// @see ajax_get_form()
$form_state = array(
'no_redirect' => TRUE,
@@ -812,8 +815,6 @@ function views_ui_ajax_get_form($form_id) {
$form_state['rebuild_info']['copy']['#action'] = TRUE;
// @see drupal_get_form()
- $args = func_get_args();
- array_shift($args);
$form_state['build_info']['args'] = $args;
$form = drupal_build_form($form_id, $form_state);
@@ -902,7 +903,7 @@ function _views_ui_get_displays_list($view) {
* @see /js/jquery.ui.dialog.patch.js
* @see /js/jquery.ui.dialog.min.js
*
- * The javascript patch overwrites the $.ui.dialog.overlay.events object to
+ * The JavaScript patch overwrites the $.ui.dialog.overlay.events object to
* remove the mousedown, mouseup and click events from the list of events that
* are bound in $.ui.dialog.overlay.create.
*/