From f30875880dfc6853cc19cea68e9a700113dcb6f4 Mon Sep 17 00:00:00 2001 From: Andrew Berry Date: Thu, 8 Sep 2011 16:03:24 -0400 Subject: [PATCH 1/3] Issue #1273550: Allow users to set default node access settings for new content. --- .../user_relationship_node_access.module | 73 +++++++++++++++++-- 1 files changed, 65 insertions(+), 8 deletions(-) diff --git a/user_relationship_node_access/user_relationship_node_access.module b/user_relationship_node_access/user_relationship_node_access.module index 991e6c1..09aff76 100644 --- a/user_relationship_node_access/user_relationship_node_access.module +++ b/user_relationship_node_access/user_relationship_node_access.module @@ -87,14 +87,62 @@ function _user_relationship_node_access_disabling($set = NULL) { } /** + * Implements hook_form_BASE_alter(). + */ +function user_relationship_node_access_form_user_profile_form_alter(&$form, &$form_state, $form_id) { + // Allow users to set default settings for sharing content. + $form += _user_relationship_node_access_permission_form('user', $form['#user']); + if (isset($form['#user']->data['user_relationship_node_access_defaults'])) { + $defaults = $form['#user']->data['user_relationship_node_access_defaults']; + foreach ($defaults as $key => $value) { + $form['user_relationship_node_access'][$key]['#default_value'] = $value; + } + } + $form['user_relationship_node_access']['#description'] = t('Set your default sharing settings when posting new content.'); +} + +/** + * Implements hook_user_presave(). + */ +function user_relationship_node_access_user_presave(&$edit, $account, $category) { + if (isset($edit['user_relationship_node_access'])) { + $edit['data']['user_relationship_node_access_defaults'] = $edit['user_relationship_node_access']; + } +} + +/** * Implements hook_form_BASE_alter() */ function user_relationship_node_access_form_node_form_alter(&$form, &$form_state, $form_id) { + // Verify we can set permissions on this node. global $user; + if ($form['#node']->uid == $user->uid && count($types = user_relationships_types_load()) > 0 && _user_relationship_node_access_node_eligible($form['#node'])) { + $form += _user_relationship_node_access_permission_form('node', $form['#node']); + } +} - // Verify we can set permissions on this node. - if ($form['#node']->uid != $user->uid || count($types = user_relationships_types_load()) == 0 || !_user_relationship_node_access_node_eligible($form['#node'])) { - return; +/** + * Helper function to generate the permissions grid for a node edit form or for + * a user edit form. + * + * @param $type + * The type of form being viewed. Either 'node' or 'user'. + * @param $object + * The object associated with the form being viewed. If $type is 'node', pass + * the node object. If $type is 'user', pass the user object. + * + * @return + * A Form API array suitable for including in another form. + */ +function _user_relationship_node_access_permission_form($type, $object) { + $form = array(); + $types = user_relationships_types_load(); + if ($type == 'node') { + $node = $object; + $account = user_load($node->uid); + } + else { + $account = $object; } foreach ($types as $rtid => $type) { @@ -111,16 +159,23 @@ function user_relationship_node_access_form_node_form_alter(&$form, &$form_state // reverse the optimization made after saving $permissions = array(); - if (isset($form['#node']->user_relationship_node_access) && is_array($form['#node']->user_relationship_node_access)) { - foreach ($form['#node']->user_relationship_node_access as $rtid => $permission) { + if ($type == 'node' && isset($node->user_relationship_node_access) && is_array($node->user_relationship_node_access)) { + foreach ($node->user_relationship_node_access as $rtid => $permission) { foreach ($permission as $action => $trash) { $permissions[$action][$rtid] = $rtid; } } } + else { + // There are no permissions set on this node. Pull in the defaults from + // the author of the node. + if (isset($account->data['user_relationship_node_access_defaults'])) { + $permissions = $account->data['user_relationship_node_access_defaults']; + } + } - // get permissions that can be set - from node author not current user - $author_allowed_perms = _user_relationship_node_access_get_allowed_grants(user_load($form['#node']->uid)); + // Get permissions that can be set - from node author or the user defaults. + $author_allowed_perms = _user_relationship_node_access_get_allowed_grants(user_load($object->uid)); if (!count($author_allowed_perms)) { return; @@ -129,7 +184,7 @@ function user_relationship_node_access_form_node_form_alter(&$form, &$form_state // use advanced form with a table if more than one permission, otherwise just a simple 'post to related users' checkbox $use_advanced_form = count($author_allowed_perms) > 1; // different labels for group posts (that have the group audience fieldset) - $is_group_post = module_exists('og') && og_is_group_content_type('node', $form['#node']->type); + $is_group_post = module_exists('og') && og_is_group_content_type('node', $node->type); $form['user_relationship_node_access'] = array( '#type' => 'fieldset', @@ -162,6 +217,8 @@ function user_relationship_node_access_form_node_form_alter(&$form, &$form_state $form['user_relationship_node_access'][$action]['#title'] = t('@action', array('@action' => ucfirst($action))); } } + + return $form; } /** -- 1.7.6.1 From 143743ff35f12cda8e43b492df574411a6ca6f1a Mon Sep 17 00:00:00 2001 From: Andrew Berry Date: Thu, 8 Sep 2011 16:51:40 -0400 Subject: [PATCH 2/3] Issue #1273550: Add a 'make default' button to the node form. --- .../user_relationship_node_access.module | 25 +++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/user_relationship_node_access/user_relationship_node_access.module b/user_relationship_node_access/user_relationship_node_access.module index 09aff76..e42169b 100644 --- a/user_relationship_node_access/user_relationship_node_access.module +++ b/user_relationship_node_access/user_relationship_node_access.module @@ -58,7 +58,7 @@ function theme_user_relationship_node_access_form($arguments) { $rows[] = $row; } - return theme('table', array('rows' => $rows)); + return theme('table', array('rows' => $rows)) . drupal_render($form['set_default']); } @@ -118,10 +118,33 @@ function user_relationship_node_access_form_node_form_alter(&$form, &$form_state global $user; if ($form['#node']->uid == $user->uid && count($types = user_relationships_types_load()) > 0 && _user_relationship_node_access_node_eligible($form['#node'])) { $form += _user_relationship_node_access_permission_form('node', $form['#node']); + $form['user_relationship_node_access']['set_default'] = array( + '#prefix' => '
', + '#type' => 'button', + '#value' => t('Make default'), + '#ajax' => array( + 'callback' => 'user_relationship_node_access_ajax_set_default', + 'wrapper' => 'user-relationship-node-access-set-default', + ), + '#limit_validation_errors' => array(), + '#suffix' => '
', + ); } } /** + * Form callback function to set the default access settings. + */ +function user_relationship_node_access_ajax_set_default($form, $form_state) { + global $user; + $defaults = array('user_relationship_node_access_defaults' => $form_state['values']['user_relationship_node_access']); + unset($defaults['user_relationship_node_access_defaults']['set_default']); + user_save($user, array('data' => $defaults)); + drupal_set_message(t("Default sharing settings have been saved.")); + return $form['user_relationship_node_access']['set_default']; +} + +/** * Helper function to generate the permissions grid for a node edit form or for * a user edit form. * -- 1.7.6.1 From 5fd6c6b3fe4cd464427ea0ae7c0b8ed692d7300e Mon Sep 17 00:00:00 2001 From: Andrew Berry Date: Mon, 12 Sep 2011 14:55:38 -0400 Subject: [PATCH 3/3] Issue #1273550: Fix not returning an array if the author has no permissions. --- .../user_relationship_node_access.module | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/user_relationship_node_access/user_relationship_node_access.module b/user_relationship_node_access/user_relationship_node_access.module index e42169b..1d3a5d3 100644 --- a/user_relationship_node_access/user_relationship_node_access.module +++ b/user_relationship_node_access/user_relationship_node_access.module @@ -201,7 +201,7 @@ function _user_relationship_node_access_permission_form($type, $object) { $author_allowed_perms = _user_relationship_node_access_get_allowed_grants(user_load($object->uid)); if (!count($author_allowed_perms)) { - return; + return array(); } // use advanced form with a table if more than one permission, otherwise just a simple 'post to related users' checkbox -- 1.7.6.1