From 7cf1fd0166206a26b69313e877ba0f64e3b0b555 Mon Sep 17 00:00:00 2001
From: Earl Miles <merlin@logrus.com>
Date: Wed, 1 Apr 2009 21:18:55 +0000
Subject: [PATCH] Make access plugins a little less focused on the term
"access" and change selection criteria to selection rules.
---
includes/context-task-handler.inc | 8 ++++----
includes/export.inc | 6 ++++--
plugins/access/node_access.inc | 2 +-
plugins/access/node_language.inc | 2 +-
plugins/access/node_type.inc | 2 +-
plugins/access/perm.inc | 2 +-
plugins/access/role.inc | 2 +-
plugins/access/site_language.inc | 4 ++--
plugins/access/term_vocabulary.inc | 2 +-
9 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/includes/context-task-handler.inc b/includes/context-task-handler.inc
index d5c97fcb..9203ef27 100644
--- a/includes/context-task-handler.inc
+++ b/includes/context-task-handler.inc
@@ -6,7 +6,7 @@
* Support for creating 'context' type task handlers.
*
* Context task handlers expect the task to provide 0 or more contexts. The
- * task handler should use those contexts as selection criteria, as well as
+ * task handler should use those contexts as selection rules, as well as
* rendering with them.
*
* The functions and forms in this file should be common to every context type
@@ -75,7 +75,7 @@ function ctools_context_handler_render($task, $subtask_id, $contexts, $page = TR
* The context objects provided by the task.
*
* @return
- * TRUE if these contexts match the selection criteria. NULL or FALSE
+ * TRUE if these contexts match the selection rules. NULL or FALSE
* otherwise.
*/
function ctools_context_handler_select($handler, $contexts) {
@@ -205,7 +205,7 @@ function ctools_context_handler_get_task_arguments($task, $subtask_id) {
}
/**
- * Form to choose context based selection criteria for a task handler.
+ * Form to choose context based selection rules for a task handler.
*
* The configuration will be assumed to go simply in $handler->conf and
* will be keyed by the argument ID.
@@ -228,7 +228,7 @@ function ctools_context_handler_edit_criteria(&$form, &$form_state) {
}
/**
- * Submit handler for criteria selection
+ * Submit handler for rules selection
*/
function ctools_context_handler_edit_criteria_submit(&$form, &$form_state) {
$form_state['handler']->conf['access']['logic'] = $form_state['values']['logic'];
diff --git a/includes/export.inc b/includes/export.inc
index 8c141a99..01c6c0c9 100644
--- a/includes/export.inc
+++ b/includes/export.inc
@@ -88,8 +88,10 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
}
else if ($type == 'conditions') {
foreach ($args as $key => $value) {
- $conditions[] = "$key = " . db_type_placeholder($schema['fields'][$key]['type']);
- $query_args[] = $value;
+ if (isset($schema['fields'][$key])) {
+ $conditions[] = "$key = " . db_type_placeholder($schema['fields'][$key]['type']);
+ $query_args[] = $value;
+ }
}
}
diff --git a/plugins/access/node_access.inc b/plugins/access/node_access.inc
index acf9e720..5de95c99 100644
--- a/plugins/access/node_access.inc
+++ b/plugins/access/node_access.inc
@@ -11,7 +11,7 @@
*/
function ctools_node_access_ctools_access() {
$args['node_access'] = array(
- 'title' => t("Node access by node security"),
+ 'title' => t("Node: Access status"),
'description' => t('Control access with built in Drupal node access test.'),
'callback' => 'ctools_node_access_ctools_access_check',
'default' => array('type' => 'view'),
diff --git a/plugins/access/node_language.inc b/plugins/access/node_language.inc
index e90ff1ae..f5b6a154 100644
--- a/plugins/access/node_language.inc
+++ b/plugins/access/node_language.inc
@@ -12,7 +12,7 @@
function ctools_node_language_ctools_access() {
if (module_exists('locale')) {
$items['node_language'] = array(
- 'title' => t("Node access by language"),
+ 'title' => t("Node: Language"),
'description' => t('Control access by node language.'),
'callback' => 'ctools_node_language_ctools_access_check',
'default' => array('language' => array()),
diff --git a/plugins/access/node_type.inc b/plugins/access/node_type.inc
index c8877650..0447abdc 100644
--- a/plugins/access/node_type.inc
+++ b/plugins/access/node_type.inc
@@ -11,7 +11,7 @@
*/
function ctools_node_type_ctools_access() {
$args['node_type'] = array(
- 'title' => t("Node access by type"),
+ 'title' => t("Node: Type"),
'description' => t('Control access by node_type.'),
'callback' => 'ctools_node_type_ctools_access_check',
'default' => array('type' => array()),
diff --git a/plugins/access/perm.inc b/plugins/access/perm.inc
index 1a271725..8ecd2960 100644
--- a/plugins/access/perm.inc
+++ b/plugins/access/perm.inc
@@ -11,7 +11,7 @@
*/
function ctools_perm_ctools_access() {
$args['perm'] = array(
- 'title' => t("Access by user permission string"),
+ 'title' => t("User: Permission string"),
'description' => t('Control access by permission string.'),
'callback' => 'ctools_perm_ctools_access_check',
'default' => array('perm' => 'access content'),
diff --git a/plugins/access/role.inc b/plugins/access/role.inc
index 1ac06671..a689584e 100644
--- a/plugins/access/role.inc
+++ b/plugins/access/role.inc
@@ -11,7 +11,7 @@
*/
function ctools_role_ctools_access() {
$args['role'] = array(
- 'title' => t("Access by user role"),
+ 'title' => t("User: role"),
'description' => t('Control access by role.'),
'callback' => 'ctools_role_ctools_access_check',
'default' => array('rids' => array()),
diff --git a/plugins/access/site_language.inc b/plugins/access/site_language.inc
index 8b91288b..a97c31fc 100644
--- a/plugins/access/site_language.inc
+++ b/plugins/access/site_language.inc
@@ -12,8 +12,8 @@
function ctools_site_language_ctools_access() {
if (module_exists('locale')) {
$items['site_language'] = array(
- 'title' => t("Access by site language"),
- 'description' => t('Control access by the language the site currently uses.'),
+ 'title' => t("User: language"),
+ 'description' => t('Control access by the language the user or site currently uses.'),
'callback' => 'ctools_site_language_ctools_access_check',
'default' => array('language' => array()),
'settings form' => 'ctools_site_language_ctools_access_settings',
diff --git a/plugins/access/term_vocabulary.inc b/plugins/access/term_vocabulary.inc
index 949598fc..1ec4798d 100644
--- a/plugins/access/term_vocabulary.inc
+++ b/plugins/access/term_vocabulary.inc
@@ -11,7 +11,7 @@
*/
function ctools_term_vocabulary_ctools_access() {
$args['term_vocabulary'] = array(
- 'title' => t("Term access by vocabulary"),
+ 'title' => t("Taxonomy: Vocabulary"),
'description' => t('Control access by term vocabulary.'),
'callback' => 'ctools_term_vocabulary_ctools_access_check',
'default' => array('vids' => array()),
--
GitLab