Skip to content

[CFM-1509] Fix group content access #1400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ordavidil wants to merge 6 commits into from
Closed

[CFM-1509] Fix group content access #1400

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
079d549
Fixing the group content access.
Sep 28, 2016
3c8d95f
Always expose the group ref field to site admins.
Sep 28, 2016
39be64e
Merge branch 'develop' into feature/CFM-1509-fix-group-content-access
ordavidil Sep 29, 2016
4e17bad
Merge branch 'develop' into feature/CFM-1509-fix-group-content-access
ordavidil Sep 29, 2016
2f17e43
Merge branch 'develop' into feature/CFM-1509-fix-group-content-access
ordavidil Nov 2, 2016
8d4e8bf
Merge branch 'develop' into feature/CFM-1509-fix-group-content-access
soniCaH Nov 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions project/profiles/capacity4more/modules/c4m/og/c4m_og/c4m_og.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,13 @@ function c4m_og_get_group_type_name($node = NULL) {
* Implements hook_form_alter().
*/
function c4m_og_form_alter(&$form, $form_state) {

// Always expose the group ref field to site administrators, but keep the
// same access for non admins.
if (isset($form[OG_AUDIENCE_FIELD]['#access'])) {
$form[OG_AUDIENCE_FIELD]['#access'] = $form[OG_AUDIENCE_FIELD]['#access'] || c4m_user_is_site_admin();
}

if (empty($form['#node_edit_form'])
|| !og_is_group_type(
'node',
Expand Down Expand Up @@ -2206,10 +2213,6 @@ function c4m_og_node_access($node, $op, $account) {
return NODE_ACCESS_IGNORE;
}

if (c4m_og_get_group_status($group) != 'pending') {
return NODE_ACCESS_IGNORE;
}

$group_access = node_access($group, $op, $account);

return $group_access ? NODE_ACCESS_ALLOW : NODE_ACCESS_DENY;
Expand Down