Skip to content
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

Jump to bottom

feat: Allow Org admins to Remove Users from their Organization #8705

Merged
merged 10 commits into from
Jul 31, 2023
Merged

feat: Allow Org admins to Remove Users from their Organization #8705

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b045266
added-remove-user-column
MonalikaPatnaik Jul 19, 2023
fe6bdd3
updated-one
MonalikaPatnaik Jul 19, 2023
586741c
moved-template-ref
MonalikaPatnaik Jul 20, 2023
7222126
minor-changes
MonalikaPatnaik Jul 20, 2023
14cc1b1
removed-user-org-field
MonalikaPatnaik Jul 21, 2023
84b148a
org-page-display-done
MonalikaPatnaik Jul 24, 2023
7ddfa3b
Merge branch 'main' into org-profile
MonalikaPatnaik Jul 25, 2023
df40fcf
Merge branch 'main' into org-profile
MonalikaPatnaik Jul 27, 2023
571213a
added-separate-subroutine
MonalikaPatnaik Jul 30, 2023
dbd60fb
Merge branch 'main' into org-profile
MonalikaPatnaik Jul 30, 2023
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
33 changes: 28 additions & 5 deletions cgi/org.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,13 +358,28 @@
if ($type eq "edit") {

store_org($org_ref);
$template_data_ref->{result} = lang("edit_org_result");

$template_data_ref->{profile_url} = canonicalize_tag_link("editors", "org-" . $orgid);
$template_data_ref->{profile_name} = sprintf(lang('user_s_page'), $org_ref->{name});
}
elsif ($type eq 'delete') {
elsif ($type eq 'user_delete') {

if (is_user_in_org_group($org_ref, $User_id, "members")) {
MonalikaPatnaik marked this conversation as resolved.
Show resolved Hide resolved
my $groups_ref = ['admins', 'members'];
my $user_to_remove = single_param('user_id');
# remove the user from org
remove_user_from_org($orgid, $user_to_remove, $groups_ref);

# Reset the 'org' field of the user
my $user_ref = retrieve_user($user_to_remove);
delete $user_ref->{org};
delete $user_ref->{org_id};
my $user_file = "$data_root/users/" . get_string_id_for_lang("no_language", $user_to_remove) . ".sto";
store($user_file, $user_ref);

}

}
$template_data_ref->{result} = lang("edit_org_result");
$template_data_ref->{profile_url} = canonicalize_tag_link("editors", "org-" . $orgid);
$template_data_ref->{profile_name} = sprintf(lang('user_s_page'), $org_ref->{name});
MonalikaPatnaik marked this conversation as resolved.
Show resolved Hide resolved
}

$template_data_ref->{orgid} = $orgid;
Expand All @@ -379,6 +394,14 @@

$log->debug("org form - template data", {template_data_ref => $template_data_ref}) if $log->is_debug();

# allow org admins to view the list of users associated with their org
my @org_members;
foreach my $member_id (sort keys %{$org_ref->{members}}) {
my $member_user_ref = retrieve_user($member_id);
push @org_members, $member_user_ref;
}
$template_data_ref->{org_members} = \@org_members;

$tt->process('web/pages/org_form/org_form.tt.html', $template_data_ref, \$html)
or $html = "<p>template error: " . $tt->error() . "</p>";

Expand Down
8 changes: 0 additions & 8 deletions lib/ProductOpener/Display.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3903,14 +3903,6 @@ HTML
$user_template_data_ref->{edit_profile} = 1;
$user_template_data_ref->{orgid} = $orgid;
}
if (defined $User{pro_moderator}) {
my @org_members;
foreach my $member_id (sort keys %{$user_or_org_ref->{members}}) {
my $member_user_ref = retrieve_user($member_id);
push @org_members, $member_user_ref;
}
$user_template_data_ref->{org_members} = \@org_members;
}

process_template('web/pages/org_profile/org_profile.tt.html',
$user_template_data_ref, \$profile_html)
Expand Down
4 changes: 4 additions & 0 deletions po/common/en.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2207,6 +2207,10 @@ msgctxt "risk_level_3"
msgid "High risks"
msgstr "High risks"

msgctxt "remove_user"
msgid "Remove user"
msgstr "Remove user"

msgctxt "salt_equivalent"
msgid "salt equivalent"
msgstr "salt equivalent"
Expand Down
44 changes: 44 additions & 0 deletions templates/web/pages/org_form/org_form.tt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,50 @@
<div class="panel" style="background-color:#ffdddd">The organization <strong>[% orgid %]</strong> does not exist yet. It will be created if you submit the form.</div>
[% END %]

[% IF org_members.size %]
alexgarel marked this conversation as resolved.
Show resolved Hide resolved
<h2>[% lang("organization_members") %]</h2>
<p>[% lang("number_of_members") %][% sep %]: [% org_members.size %]</p>
<div style="position:relative">
<table>
<thead>
<tr>
<th>[% lang("serial_no") %]</th>
<th>[% lang("username") %]</th>
<th>[% lang("name") %]</th>
<th>[% lang("email") %]</th>
<th>[% lang("select_lang") %]</th>
<th>[% lang("select_country") %]</th>
<th>[% lang("delete_user") %]</th>

</tr>
</thead>
<tbody>
[% SET count = 1 %]
[% FOREACH users IN org_members %]
<tr>
<td>[% count %].</td>
<td>[% users.userid %]</td>
<td>[% users.name %]</td>
<td>[% users.email %]</td>
<td>[% users.initial_lc %]</td>
<td>[% users.initial_cc %]</td>
<td>
<form method="post" action="/cgi/org.pl" onsubmit="return confirm('Are you sure you want to remove this user?')">
<input type="hidden" name="action" value="process" />
<input type="hidden" name="type" value="user_delete" />
<input type="hidden" name="org_id" value="[% orgid %]">
<input type="hidden" name="user_id" value="[% users.userid %]">
<input type="submit" name="remove_user" class="button small" value="[% lang("remove_user") %]"/ />
</form>
</td>
</tr>
[% SET count = count + 1 %]
[% END %]
</tbody>
</table>
</div>
[% END %]

<!-- Start form -->

<p>[% lang('org_profile_description') %]</p>
Expand Down
35 changes: 0 additions & 35 deletions templates/web/pages/org_profile/org_profile.tt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,6 @@
<p>&rarr; <a href="[% link %]" rel="noopener" target="_blank">[% lang("official_site") %]</a></p>
[% END %]

[% IF org_members.size %]
<h2>[% lang("organization_members") %]</h2>
<p>[% lang("number_of_members") %][% sep %]: [% org_members.size %]</p>
<div style="position:relative">
<table>
<thead>
<tr>
<th>[% lang("serial_no") %]</th>
<th>[% lang("username") %]</th>
<th>[% lang("name") %]</th>
<th>[% lang("email") %]</th>
<th>[% lang("select_lang") %]</th>
<th>[% lang("select_country") %]</th>

</tr>
</thead>
<tbody>
[% FOREACH users IN org_members %]
[% SET count = 1 %]
<tr>
<td>[% count %].</td>
<td>[% users.userid %]</td>
<td>[% users.name %]</td>
<td>[% users.email %]</td>
<td>[% users.initial_lc %]</td>
<td>[% users.initial_cc %]</td>
</tr>
[% SET count = count + 1 %]
[% END %]
</tbody>
</table>
</div>
[% END %]


<div class="row">

[% FOREACH contact IN ['customer_service', 'commercial_service'] %]
Expand Down
Loading