Skip to content

Add new user role sub_admin to see but not edit applications data #289

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

Merged
merged 1 commit into from
Oct 19, 2018
Merged

Add new user role sub_admin to see but not edit applications data #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions plugins/cc-global-network/admin/assets/js/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,15 @@ jQuery(document).ready(function($){
{
'targets': 7,
'render' : function(data, type, row, meta) {
var output = '<span class="inline-buttons">';
output += '<a href="?page=global-network-application-change-vouchers&user_id=' + data.ID + '" target="_blank" class="button button-icon change_vouchers" data-user-id="' + data.ID + '" title="Change Vouchers"><span class="dashicons dashicons-universal-access-alt"></span></a>';
output += '<button class="button button-icon reset_vouchers" onClick="$.resetVouchers(' + data.ID + ')" data-user-id="' + data.ID + '" title="Reset Vouchers selection"><span class="dashicons dashicons-image-rotate"></span></button>';
output += '</span>';
var output = '';
if (wpApiSettings.is_sub_admin != 'yes') {
output += '<span class="inline-buttons">';
output += '<a href="?page=global-network-application-change-vouchers&user_id=' + data.ID + '" target="_blank" class="button button-icon change_vouchers" data-user-id="' + data.ID + '" title="Change Vouchers"><span class="dashicons dashicons-universal-access-alt"></span></a>';
output += '<button class="button button-icon reset_vouchers" onClick="$.resetVouchers(' + data.ID + ')" data-user-id="' + data.ID + '" title="Reset Vouchers selection"><span class="dashicons dashicons-image-rotate"></span></button>';
output += '</span>';
} else {
output += 'No actions';
}
return output;
}
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/cc-global-network/admin/list-members.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ function ccgn_application_list_members_menu () {
'global-network-application-approval',
'List Members',
'List Members',
'ccgn_pre_approve',
'ccgn_sub_admin_view',
'global-network-list-users',
'ccgn_list_members_admin_page'
);
Expand Down
6 changes: 3 additions & 3 deletions plugins/cc-global-network/admin/user-application-page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,9 +436,9 @@ function ccgn_application_users_page_render_state ( $applicant_id, $state ) {
echo _('<h3>Pre-Approve</h3>');
ccgn_application_users_page_pre_form ( $applicant_id );
} elseif ( $state == CCGN_APPLICATION_STATE_VOUCHING ) {
echo _('<h3>Vote</h3>');
ccgn_application_users_page_vote_form ( $applicant_id );
if ( ccgn_current_user_is_final_approver() ) {
if (ccgn_current_user_is_final_approver()) {
echo _('<h3>Vote</h3>');
ccgn_application_users_page_vote_form ( $applicant_id );
echo _('<h3>Final Approval</h3>');
ccgn_application_users_page_final_approval_form( $applicant_id );
}
Expand Down
3 changes: 2 additions & 1 deletion plugins/cc-global-network/cc-global-network.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,8 @@ function ccgn_admin_enqueue_scripts($hook_suffix) {
'current_user' => get_current_user_id(),
'site_epoch' => CCGN_SITE_EPOCH,
'date_now' => date("Y-m-d"),
'ajax_url' => admin_url('admin-ajax.php')
'ajax_url' => admin_url('admin-ajax.php'),
'is_sub_admin' => (ccgn_current_user_is_sub_admin()) ? 'yes' : 'no'
));
}
}
Expand Down
49 changes: 48 additions & 1 deletion plugins/cc-global-network/includes/buddypress-integration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@

define( 'CCGN_USER_ROLE_CC_LEGAL_TEAM', 'membership-cc-legal' );

// User is a sub admin. new profile added on Octobre, 2018
// The purpose is a rol that can only see some applications data on the admin screens
// the sub-admin can't make any action

define('CCGN_USER_ROLE_SUB_ADMIN', 'membership-cc-sub-admin');

// Which Field Groups different levels of registration/vouching can see
// Admin users are handled separately

Expand Down Expand Up @@ -135,6 +141,10 @@ function ccgn_add_roles_on_plugin_activation () {
$approver->add_cap( 'ccgn_view_applications' );
$legal->add_cap( 'ccgn_view_applications' );

$council->add_cap('ccgn_sub_admin_view');
$approver->add_cap('ccgn_sub_admin_view');
$legal->add_cap('ccgn_sub_admin_view');

$council->add_cap( 'ccgn_list_applications' );
$approver->add_cap( 'ccgn_list_applications' );
$legal->add_cap( 'ccgn_list_applications' );
Expand All @@ -144,8 +154,34 @@ function ccgn_add_roles_on_plugin_activation () {
$legal->add_cap( 'ccgn_list_applications_legal' );
// The Final Approver can list but not approve legal-stage applications
$approver->add_cap( 'ccgn_list_applications_legal' );
//Create sub_admin role
add_sub_admin_role();
}

// The subadmin function have the permission to see the application list
// but can not make any actions

function add_sub_admin_role() {
$result = add_role(
CCGN_USER_ROLE_SUB_ADMIN,
'CC Sub Administrator',
array()
);
if (null !== $result ) {
$sub_admin = get_role(CCGN_USER_ROLE_SUB_ADMIN);
$sub_admin->add_cap('ccgn_view_applications');
$sub_admin->add_cap('ccgn_list_applications');
$sub_admin->add_cap('ccgn_sub_admin_view');
$sub_admin->add_cap('ccgn_list_applications_legal');
}
$council = get_role(CCGN_USER_ROLE_MEMBERSHIP_COUNCIL);
$approver = get_role(CCGN_USER_ROLE_FINAL_APPROVER);
$legal = get_role(CCGN_USER_ROLE_CC_LEGAL_TEAM);

$council->add_cap('ccgn_sub_admin_view');
$approver->add_cap('ccgn_sub_admin_view');
$legal->add_cap('ccgn_sub_admin_view');
}
function ccgn_user_is_new ( $user_id ) {
$new = true;
$user = get_user_by( 'ID', $user_id );
Expand Down Expand Up @@ -227,11 +263,22 @@ function ccgn_current_user_is_legal_team () {
}
return $is;
}
function ccgn_current_user_is_sub_admin()
{
$is = false;
if (is_user_logged_in()) {
$user_id = get_current_user_id();
$data = get_userdata($user_id);
$is = in_array(CCGN_USER_ROLE_SUB_ADMIN, $data->roles);
}
return $is;
}

function ccgn_current_user_can_see_user_application_page () {
return ccgn_current_user_is_membership_council ()
|| ccgn_current_user_is_final_approver ()
|| ccgn_current_user_is_legal_team ();
|| ccgn_current_user_is_legal_team ()
|| ccgn_current_user_is_sub_admin();
}

////////////////////////////////////////////////////////////////////////////////
Expand Down