diff --git a/includes/content.views.inc b/includes/content.views.inc index 55dae8f31e6b6f6c30640e257b78eb6cfdc6953e..f5c246fdf1ff7794f0b0b64eab0da47c7470db30 100644 --- a/includes/content.views.inc +++ b/includes/content.views.inc @@ -102,6 +102,9 @@ function content_views_field_views_data($field) { 'additional fields' => $columns, 'content_field_name' => $field['field_name'], 'allow_empty' => TRUE, + // Access control modules should implement content_views_access_callback(). + 'access callback' => 'content_views_access_callback', + 'access arguments' => array($field), ), 'argument' => array( 'field' => $columns[0], @@ -260,21 +263,6 @@ class views_handler_field_content extends views_handler_field_node { $this->content_field = content_fields($this->definition['content_field_name']); } - /** - * This provides a method of controlling field-level access in Views. - */ - function access() { - // Avoid FALSE returns for non-existant hooks by using module_implements() - // to check only modules that implement the hook. - $modules = module_implements('content_views_access'); - foreach ($modules as $module) { - if (module_invoke($module, 'content_views_access', $this->definition['content_field_name']) === FALSE) { - return FALSE; - } - } - return parent::access(); - } - function options(&$options) { parent::options($options); $field = $this->content_field; diff --git a/modules/content_permissions/content_permissions.install b/modules/content_permissions/content_permissions.install new file mode 100644 index 0000000000000000000000000000000000000000..74c95fa3ffa26159e248dc5aa36d84aa298520e3 --- /dev/null +++ b/modules/content_permissions/content_permissions.install @@ -0,0 +1,8 @@ +configure your field permissions immediately. All fields are inaccessible by default.', array('!url' => url('admin/user/access', array('fragment' => 'content_permissions'))))); +} \ No newline at end of file diff --git a/modules/content_permissions/content_permissions.module b/modules/content_permissions/content_permissions.module index 997800f07b90b4dc58aa93171fa315b007529156..51041441cde354cc4846255db7657c070195c51e 100644 --- a/modules/content_permissions/content_permissions.module +++ b/modules/content_permissions/content_permissions.module @@ -1,12 +1,5 @@