Skip to content
This repository was archived by the owner on Aug 14, 2023. It is now read-only.

Commit a9fc89d

Browse files
martinydemartinyde
committed
DEVSUPP-128: Updated admin_views, nodequeue and webform modules
1 parent 5fda7e8 commit a9fc89d

File tree

98 files changed

+3262
-1922
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+3262
-1922
lines changed

‎sites/all/modules/contrib/admin_views/admin_views.info

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ files[] = plugins/views_plugin_access_menu.inc
1010

1111
files[] = tests/admin_views.test
1212

13-
; Information added by Drupal.org packaging script on 2016-08-02
14-
version = "7.x-1.6"
13+
; Information added by Drupal.org packaging script on 2019-11-19
14+
version = "7.x-1.7"
1515
core = "7.x"
1616
project = "admin_views"
17-
datestamp = "1470165840"
18-
17+
datestamp = "1574192287"

‎sites/all/modules/contrib/admin_views/admin_views.install

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,25 @@ function admin_views_install() {
1414
db_query("UPDATE {system} SET weight = 12 WHERE name = 'admin_views'");
1515
}
1616

17+
/**
18+
* Remove deprecated views_plugin_access_menu plugin.
19+
*/
20+
function admin_views_update_7100() {
21+
$result = db_query("SELECT vid, id, display_options FROM {views_display}");
22+
foreach ($result as $record) {
23+
$options = unserialize($record->display_options);
24+
if (isset($options['access']) && is_array($options['access']) && isset($options['access']['type']) && $options['access']['type'] === 'menu') {
25+
$options['access'] = array(
26+
'type' => 'perm',
27+
'perm' => 'access administration pages',
28+
);
29+
30+
db_query("UPDATE {views_display} SET display_options = :options WHERE vid = :vid AND id = :id", array(
31+
'vid' => $record->vid,
32+
'id' => $record->id,
33+
'options' => serialize($options),
34+
));
35+
}
36+
}
37+
}
38+

‎sites/all/modules/contrib/admin_views/admin_views.views.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ function admin_views_views_plugins() {
2929
),
3030
'access' => array(
3131
'menu' => array(
32-
'title' => t('Menu system path'),
33-
'help' => t('Access will be granted based on the original system path.'),
32+
'title' => t('(Deprecated) Menu system path'),
33+
'help' => t('This has been deprecated. <strong>DO NOT USE!</strong>'),
3434
'handler' => 'views_plugin_access_menu',
3535
'uses options' => FALSE,
3636
'path' => "$path/plugins",

‎sites/all/modules/contrib/admin_views/admin_views.views_default.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ function admin_views_views_default_views() {
2020

2121
// Collect all modules providing admin_views_default.
2222
$modules = module_list();
23+
// Place admin_views at the start of the list to allow other modules to
24+
// override the default views.
25+
$modules = array('admin_views' => 'admin_views') + $modules;
2326
foreach ($modules as $module) {
2427
$dir = DRUPAL_ROOT . '/' . drupal_get_path('module', $module) . '/admin_views_default';
2528
if (is_dir($dir)) {

‎sites/all/modules/contrib/admin_views/admin_views_default/book.admin-content-book.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ $handler = $view->new_display('default', 'Master', 'default');
2020
$handler->display->display_options['title'] = 'Books';
2121
$handler->display->display_options['use_ajax'] = TRUE;
2222
$handler->display->display_options['use_more_always'] = FALSE;
23-
$handler->display->display_options['access']['type'] = 'menu';
23+
$handler->display->display_options['access']['type'] = 'perm';
24+
$handler->display->display_options['access']['perm'] = 'access administration pages';
2425
$handler->display->display_options['cache']['type'] = 'none';
2526
$handler->display->display_options['query']['type'] = 'views_query';
2627
$handler->display->display_options['exposed_form']['type'] = 'basic';

‎sites/all/modules/contrib/admin_views/admin_views_default/comment.admin-content-comment.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ $handler->display->display_options['title'] = 'Comments';
2121
$handler->display->display_options['css_class'] = 'admin-views-view';
2222
$handler->display->display_options['use_ajax'] = TRUE;
2323
$handler->display->display_options['use_more_always'] = FALSE;
24-
$handler->display->display_options['access']['type'] = 'menu';
24+
$handler->display->display_options['access']['type'] = 'perm';
25+
$handler->display->display_options['access']['perm'] = 'access administration pages';
2526
$handler->display->display_options['cache']['type'] = 'none';
2627
$handler->display->display_options['query']['type'] = 'views_query';
2728
$handler->display->display_options['query']['options']['query_comment'] = FALSE;

‎sites/all/modules/contrib/admin_views/admin_views_default/node.admin-content.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ $handler->display->display_options['title'] = 'Content';
2121
$handler->display->display_options['css_class'] = 'admin-views-view';
2222
$handler->display->display_options['use_ajax'] = TRUE;
2323
$handler->display->display_options['use_more_always'] = FALSE;
24-
$handler->display->display_options['access']['type'] = 'menu';
24+
$handler->display->display_options['access']['type'] = 'perm';
25+
$handler->display->display_options['access']['perm'] = 'access administration pages';
2526
$handler->display->display_options['cache']['type'] = 'none';
2627
$handler->display->display_options['query']['type'] = 'views_query';
2728
$handler->display->display_options['query']['options']['distinct'] = TRUE;

‎sites/all/modules/contrib/admin_views/admin_views_default/taxonomy.admin-content-taxonomy.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ $handler = $view->new_display('default', 'Defaults', 'default');
2020
$handler->display->display_options['title'] = 'Terms';
2121
$handler->display->display_options['use_ajax'] = TRUE;
2222
$handler->display->display_options['use_more_always'] = FALSE;
23-
$handler->display->display_options['access']['type'] = 'menu';
23+
$handler->display->display_options['access']['type'] = 'perm';
24+
$handler->display->display_options['access']['perm'] = 'access administration pages';
2425
$handler->display->display_options['cache']['type'] = 'none';
2526
$handler->display->display_options['query']['type'] = 'views_query';
2627
$handler->display->display_options['exposed_form']['type'] = 'basic';

‎sites/all/modules/contrib/admin_views/admin_views_default/user.admin-people.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ $handler->display->display_options['title'] = 'Users';
2121
$handler->display->display_options['css_class'] = 'admin-views-view';
2222
$handler->display->display_options['use_ajax'] = TRUE;
2323
$handler->display->display_options['use_more_always'] = FALSE;
24-
$handler->display->display_options['access']['type'] = 'menu';
24+
$handler->display->display_options['access']['type'] = 'perm';
25+
$handler->display->display_options['access']['perm'] = 'access administration pages';
2526
$handler->display->display_options['cache']['type'] = 'none';
2627
$handler->display->display_options['query']['type'] = 'views_query';
2728
$handler->display->display_options['query']['options']['query_comment'] = FALSE;

‎sites/all/modules/contrib/admin_views/plugins/views_plugin_access_menu.inc

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,24 @@
66
*/
77

88
/**
9-
* Access plugin that provides router item-based access control.
9+
* (Deprecated) Access plugin that provides router item-based access control.
1010
*
1111
* @ingroup views_access_plugins
1212
*/
1313
class views_plugin_access_menu extends views_plugin_access {
14+
1415
/**
15-
* Checks access to the view in case the current path is not the router path defined for the view.
16-
*
17-
* When accessing/rendering a view on a different page than the original menu
18-
* router path, then the menu system will not have checked access to the view.
19-
* In that case, we need to check access to the router path manually.
16+
* {@inheritdoc}
2017
*/
21-
function access($account) {
22-
// Retrieve the original router path for this view, and check access to it.
23-
// Get this based on the display property of this access plugin, not the
24-
// view itself. The 'current display' could be set to something else, like
25-
// default.
26-
$path = $this->display->handler->get_option('path');
27-
28-
if (empty($path)) {
29-
return FALSE;
30-
}
31-
32-
$item = menu_get_item($path);
33-
34-
// If we are on the original router path, the menu system has checked access already.
35-
if ($item['href'] == $_GET['q']) {
36-
return TRUE;
37-
}
18+
public function access($account) {
19+
return FALSE;
20+
}
3821

39-
return $item['access'];
22+
/**
23+
* {@inheritdoc}
24+
*/
25+
public function get_access_callback() {
26+
return FALSE;
4027
}
28+
4129
}

‎sites/all/modules/contrib/admin_views/plugins/views_plugin_display_system.inc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,11 @@ class views_plugin_display_system extends views_plugin_display {
5959
// @see options_summary()
6060
$options['defaults']['default']['access'] = FALSE;
6161
$options['access'] = array(
62+
// This isn't actually used, but we set it to a reasonable value, in case
63+
// this gets cloned to a display of a different type.
6264
'default' => array(
63-
'type' => 'menu',
65+
'type' => 'perm',
66+
'perm' => 'access administration pages',
6467
),
6568
);
6669

‎sites/all/modules/contrib/admin_views/tests/admin_views_test/admin_views_test.info

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ hidden = TRUE
66

77
dependencies[] admin_views
88

9-
; Information added by Drupal.org packaging script on 2016-08-02
10-
version = "7.x-1.6"
9+
; Information added by Drupal.org packaging script on 2019-11-19
10+
version = "7.x-1.7"
1111
core = "7.x"
1212
project = "admin_views"
13-
datestamp = "1470165840"
14-
13+
datestamp = "1574192287"

‎sites/all/modules/contrib/nodequeue/addons/nodequeue_service/nodequeue_service.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ function nodequeue_service_get_nodequeues() {
3434
$availablequeues[$queue->qid]['show_in_links'] = $queue->show_in_links;
3535
$availablequeues[$queue->qid]['reference'] = $queue->reference;
3636
$availablequeues[$queue->qid]['reverse'] = $queue->reverse;
37+
$availablequeues[$queue->qid]['unique_entries'] = $queue->unique_entries;
3738
$availablequeues[$queue->qid]['subqueues'] = $queue->subqueues;
3839
$availablequeues[$queue->qid]['types'] = $queue->types;
3940
$availablequeues[$queue->qid]['roles'] = $queue->roles;

‎sites/all/modules/contrib/nodequeue/addons/nodequeue_service/nodequeue_service.info

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ dependencies[] = nodequeue
88

99
files[] = nodequeue_service.inc
1010

11-
; Information added by Drupal.org packaging script on 2016-06-15
12-
version = "7.x-2.1"
11+
; Information added by Drupal.org packaging script on 2019-11-22
12+
version = "7.x-2.2"
1313
core = "7.x"
1414
project = "nodequeue"
15-
datestamp = "1465949041"
16-
15+
datestamp = "1574395688"

‎sites/all/modules/contrib/nodequeue/includes/nodequeue.actions.inc

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,6 @@
55
* Provides actions integration for nodequeues.
66
*/
77

8-
/**
9-
* Implements hook_action_info().
10-
*/
11-
function nodequeue_action_info() {
12-
return array(
13-
'nodequeue_add_action' => array(
14-
'type' => 'node',
15-
'label' => t('Add to Nodequeues'),
16-
'configurable' => TRUE,
17-
'triggers' => array(
18-
'node_presave',
19-
'node_insert',
20-
'node_update',
21-
),
22-
),
23-
'nodequeue_remove_action' => array(
24-
'type' => 'node',
25-
'label' => t('Remove from Nodequeues'),
26-
'configurable' => TRUE,
27-
'triggers' => array(
28-
'node_delete',
29-
),
30-
),
31-
);
32-
}
33-
348
/**
359
* Configuration form for Add to Nodequeues action.
3610
*/

0 commit comments

Comments
 (0)